diff --git a/niucloud/app/ExceptionHandle.php b/niucloud/app/ExceptionHandle.php index da5eb4900..5a6140a95 100644 --- a/niucloud/app/ExceptionHandle.php +++ b/niucloud/app/ExceptionHandle.php @@ -45,7 +45,7 @@ class ExceptionHandle extends Handle { // 使用内置的方式记录异常日志 // parent::report($exception); - if (!$this->isIgnoreReport($e)) { + if (!$this->isIgnoreReport($e) && env('app_debug', false)) { $data = [ 'file' => $e->getFile(), 'line' => $e->getLine(), diff --git a/niucloud/app/adminapi/controller/addon/Addon.php b/niucloud/app/adminapi/controller/addon/Addon.php index b2749820a..350ae9a5d 100644 --- a/niucloud/app/adminapi/controller/addon/Addon.php +++ b/niucloud/app/adminapi/controller/addon/Addon.php @@ -18,15 +18,28 @@ use core\base\BaseAdminController; use think\Response; +/** + * 插件管理 + * Class Addon + * @description 插件管理 + * @package app\adminapi\controller\addon + */ class Addon extends BaseAdminController { + /** + * 插件初始化 + * @description 插件初始化 + * @return Response + */ public function init() { return success((new CoreAddonService())->getInitList()); } + /** * 获取已下载插架 + * @description 获取已下载插架 */ public function getLocalAddonList() { @@ -35,6 +48,7 @@ class Addon extends BaseAdminController /** * 安装插件 + * @description 安装插件 * @param string $addon */ public function install($addon) @@ -44,6 +58,7 @@ class Addon extends BaseAdminController /** * 云安装插件 + * @description 云安装插件 * @param $addon * @return Response */ @@ -54,6 +69,7 @@ class Addon extends BaseAdminController /** * 获取安装任务 + * @description 获取安装任务 * @return Response */ public function getInstallTask() { @@ -62,6 +78,7 @@ class Addon extends BaseAdminController /** * 获取云安装日志 + * @description 获取云安装日志 * @param $addon * @return mixed */ @@ -71,6 +88,7 @@ class Addon extends BaseAdminController /** * 插件安装环境检测 + * @description 插件安装环境检测 * @param $addon * @return Response */ @@ -81,6 +99,7 @@ class Addon extends BaseAdminController /** * 取消安装 + * @description 取消安装 * @param $addon * @return mixed */ @@ -91,6 +110,7 @@ class Addon extends BaseAdminController /** * 卸载插件 + * @description 卸载插件 * @param string $addon */ public function uninstall($addon) @@ -101,6 +121,7 @@ class Addon extends BaseAdminController /** * 插件安装环境检测 + * @description 插件安装环境检测 * @param $addon * @return Response */ @@ -111,6 +132,7 @@ class Addon extends BaseAdminController /** * 插件列表 + * @description 插件列表 * @return Response */ public function lists() @@ -123,6 +145,7 @@ class Addon extends BaseAdminController /** * 插件详情 + * @description 插件详情 * @param int $id * @return Response */ @@ -133,6 +156,7 @@ class Addon extends BaseAdminController /** * 设置插件状态 + * @description 设置插件状态 * @param int $id * @param int $status * @return Response @@ -145,7 +169,8 @@ class Addon extends BaseAdminController /** * 下载插件 - * @param $app_key + * @description 下载插件 + * @param $addon * @return Response */ public function download($addon){ @@ -158,6 +183,7 @@ class Addon extends BaseAdminController /** * 查询已安装插件 + * @description 查询已安装插件 * @return Response */ public function getInstallList(){ @@ -166,6 +192,7 @@ class Addon extends BaseAdminController /** * 查询已安装有效应用 + * @description 查询已安装有效应用 */ public function getAddonList() { @@ -174,6 +201,7 @@ class Addon extends BaseAdminController /** * 插件类型 + * @description 插件类型 * @return Response */ public function getType(){ @@ -182,7 +210,8 @@ class Addon extends BaseAdminController /** * 更新插件 - * @param $app_key + * @description 更新插件 + * @param $addon * @return Response */ public function upgrade($addon = ''){ @@ -191,6 +220,7 @@ class Addon extends BaseAdminController /** * 获取首页应用标签 + * @description 获取首页应用标签 */ public function getIndexAddonLabelList() { @@ -199,6 +229,7 @@ class Addon extends BaseAdminController /** * 获取首页应用 + * @description 获取首页应用 * @return Response */ public function getIndexAddonList() diff --git a/niucloud/app/adminapi/controller/addon/AddonDevelop.php b/niucloud/app/adminapi/controller/addon/AddonDevelop.php index 135828738..84c3a9113 100644 --- a/niucloud/app/adminapi/controller/addon/AddonDevelop.php +++ b/niucloud/app/adminapi/controller/addon/AddonDevelop.php @@ -16,11 +16,18 @@ use app\service\admin\addon\AddonDevelopService; use core\base\BaseAdminController; use think\Response; +/** + * 开发插件 + * Class AddonDevelop + * @description 开发插件 + * @package app\adminapi\controller\addon + */ class AddonDevelop extends BaseAdminController { /** * 开发插件列表 + * @description 开发插件列表 */ public function lists() { @@ -30,6 +37,12 @@ class AddonDevelop extends BaseAdminController return success(( new AddonDevelopService() )->getList($data[ 'search' ])); } + /** + * 开发插件详情 + * @description 开发插件详情 + * @param $key + * @return Response + */ public function info($key) { return success(( new AddonDevelopService() )->getInfo($key)); @@ -37,6 +50,7 @@ class AddonDevelop extends BaseAdminController /** * 开发插件新增 + * @description 开发插件新增 * @return Response */ public function add(string $key) @@ -60,6 +74,7 @@ class AddonDevelop extends BaseAdminController /** * 开发插件更新 + * @description 开发插件更新 * @param string $id * @return Response */ @@ -85,6 +100,7 @@ class AddonDevelop extends BaseAdminController /** * 删除开发插件 + * @description 删除开发插件 * @param $key * @return Response */ @@ -95,7 +111,8 @@ class AddonDevelop extends BaseAdminController } /** - *校验key是否被占用 + * 校验key是否被占用 + * @description 校验key是否被占用 * @param $key * @return void */ @@ -106,6 +123,7 @@ class AddonDevelop extends BaseAdminController /** * 打包 + * @description 打包 * @param $key * @return Response */ @@ -117,6 +135,7 @@ class AddonDevelop extends BaseAdminController /** * 下载 + * @description 下载 * @param $key * @return Response */ @@ -127,7 +146,8 @@ class AddonDevelop extends BaseAdminController } /** - * + * 插件key黑名单 + * @description 插件key黑名单 * @return Response */ public function keyBlackList() diff --git a/niucloud/app/adminapi/controller/addon/Backup.php b/niucloud/app/adminapi/controller/addon/Backup.php index 815c62d0d..3eaa4b6e2 100644 --- a/niucloud/app/adminapi/controller/addon/Backup.php +++ b/niucloud/app/adminapi/controller/addon/Backup.php @@ -15,11 +15,18 @@ use app\service\admin\upgrade\BackupRecordsService; use core\base\BaseAdminController; use think\Response; +/** + * 备份管理 + * Class Backup + * @description 备份管理 + * @package app\adminapi\controller\addon + */ class Backup extends BaseAdminController { /** * 获取升级记录分页列表 + * @description 获取升级记录分页列表 * @return Response */ public function getRecords() @@ -32,6 +39,7 @@ class Backup extends BaseAdminController /** * 修改备注 + * @description 修改备注 * @return Response */ public function modifyRemark() @@ -46,6 +54,7 @@ class Backup extends BaseAdminController /** * 恢复前检测文件是否存在 + * @description 恢复前检测文件是否存在 * @return Response */ public function checkDirExist() @@ -58,6 +67,7 @@ class Backup extends BaseAdminController /** * 检测目录权限 + * @description 检测目录权限 * @return Response */ public function checkPermission() @@ -67,6 +77,7 @@ class Backup extends BaseAdminController /** * 恢复备份 + * @description 恢复备份 * @return Response */ public function restoreBackup() @@ -81,6 +92,7 @@ class Backup extends BaseAdminController /** * 删除升级记录 + * @description 删除升级记录 * @return Response */ public function deleteRecords() @@ -94,6 +106,7 @@ class Backup extends BaseAdminController /** * 手动备份 + * @description 手动备份 * @return Response */ public function manualBackup() @@ -107,6 +120,7 @@ class Backup extends BaseAdminController /** * 获取正在进行的恢复任务 + * @description 获取正在进行的恢复任务 * @return Response */ public function getRestoreTask() @@ -116,6 +130,7 @@ class Backup extends BaseAdminController /** * 获取正在进行的备份任务 + * @description 获取正在进行的备份任务 * @return Response */ public function getBackupTask() diff --git a/niucloud/app/adminapi/controller/addon/Upgrade.php b/niucloud/app/adminapi/controller/addon/Upgrade.php index 6f213af04..bc0ed2419 100644 --- a/niucloud/app/adminapi/controller/addon/Upgrade.php +++ b/niucloud/app/adminapi/controller/addon/Upgrade.php @@ -16,11 +16,18 @@ use app\service\admin\upgrade\UpgradeService; use core\base\BaseAdminController; use think\Response; +/** + * 升级管理 + * Class Upgrade + * @description 升级管理 + * @package app\adminapi\controller\addon + */ class Upgrade extends BaseAdminController { /** * 更新插件 - * @param $app_key + * @description 更新插件 + * @param $addon * @return Response */ public function upgrade($addon = '') @@ -34,7 +41,7 @@ class Upgrade extends BaseAdminController /** * 执行升级 - * @param $app_key + * @description 执行升级 * @return Response */ public function execute() @@ -44,6 +51,7 @@ class Upgrade extends BaseAdminController /** * 获取升级内容 + * @description 获取升级内容 * @param $addon * @return Response */ @@ -54,6 +62,7 @@ class Upgrade extends BaseAdminController /** * 获取正在进行的升级任务 + * @description 获取正在进行的升级任务 * @return Response */ public function getUpgradeTask() @@ -63,6 +72,7 @@ class Upgrade extends BaseAdminController /** * 升级前环境检测 + * @description 升级前环境检测 * @param $addon * @return Response */ @@ -73,6 +83,7 @@ class Upgrade extends BaseAdminController /** * 清除 + * @description 清除升级任务 * @return Response */ public function clearUpgradeTask() @@ -80,12 +91,19 @@ class Upgrade extends BaseAdminController return success(data: ( new UpgradeService() )->clearUpgradeTask(0, 1)); } + /** + * 操作 + * @description 操作 + * @param $operate + * @return Response + */ public function operate($operate) { return success(( new UpgradeService() )->operate($operate)); } /** * 获取升级记录分页列表 + * @description 获取升级记录分页列表 * @return Response */ public function getRecords() @@ -96,6 +114,11 @@ class Upgrade extends BaseAdminController return success(( new UpgradeRecordsService() )->getPage($data)); } + /** + * 刪除升级记录 + * @description 刪除升级记录 + * @return Response + */ public function delRecords() { $data = $this->request->params([ [ 'ids', '' ], diff --git a/niucloud/app/adminapi/controller/aliapp/Config.php b/niucloud/app/adminapi/controller/aliapp/Config.php index 6cd1cd217..0f9c135d9 100644 --- a/niucloud/app/adminapi/controller/aliapp/Config.php +++ b/niucloud/app/adminapi/controller/aliapp/Config.php @@ -15,10 +15,17 @@ use app\service\admin\aliapp\AliappConfigService; use core\base\BaseAdminController; use think\Response; +/** + * 支付宝配置 + * Class Config + * @description 支付宝配置 + * @package app\adminapi\controller\aliapp + */ class Config extends BaseAdminController { /** * 获取支付宝配置信息 + * @description 获取支付宝配置信息 * @return Response */ public function get() @@ -28,6 +35,7 @@ class Config extends BaseAdminController /** * 设置支付宝配置信息 + * @description 设置支付宝配置信息 * @return Response */ public function set() @@ -49,6 +57,7 @@ class Config extends BaseAdminController /** * 静态资源 + * @description 静态资源 * @return Response */ public function static() diff --git a/niucloud/app/adminapi/controller/applet/SiteVersion.php b/niucloud/app/adminapi/controller/applet/SiteVersion.php index 6eab700a2..020817a63 100644 --- a/niucloud/app/adminapi/controller/applet/SiteVersion.php +++ b/niucloud/app/adminapi/controller/applet/SiteVersion.php @@ -17,23 +17,25 @@ use think\Response; /** * 站点小程序版本升级下载控制器 + * @description 站点小程序版本升级下载 */ class SiteVersion extends BaseAdminController { /** * 列表 + * @description 列表 * @return Response */ public function lists() { $data = $this->request->params([ - ]); return success((new AppletVersionSiteService())->getPage($data)); } /** * 详情 + * @description 详情 * @param int $id * @return Response */ @@ -44,6 +46,7 @@ class SiteVersion extends BaseAdminController /** * 查询最后一个下载或升级的版本 + * @description 查询最后一个下载或升级的版本 * @param string $type * @return Response */ @@ -54,6 +57,7 @@ class SiteVersion extends BaseAdminController /** * 查看可升级的最高版本 + * @description 查看可升级的最高版本 * @param string $type * @return Response */ diff --git a/niucloud/app/adminapi/controller/applet/Version.php b/niucloud/app/adminapi/controller/applet/Version.php index e0b06a8ae..46a3f0cf5 100644 --- a/niucloud/app/adminapi/controller/applet/Version.php +++ b/niucloud/app/adminapi/controller/applet/Version.php @@ -18,11 +18,13 @@ use think\Response; /** * 小程序版本管理控制器 + * @description 小程序版本管理 */ class Version extends BaseAdminController { /** * 列表 + * @description 列表 * @return Response */ public function lists() @@ -35,6 +37,7 @@ class Version extends BaseAdminController /** * 详情 + * @description 详情 * @param int $id * @return Response */ @@ -45,6 +48,7 @@ class Version extends BaseAdminController /** * 添加 + * @description 添加 * @return Response */ public function add() @@ -62,6 +66,7 @@ class Version extends BaseAdminController /** * 编辑 + * @description 编辑 * @param int $id * @return Response */ @@ -80,6 +85,7 @@ class Version extends BaseAdminController /** * 删除 + * @description 删除 * @param int $id * @return Response */ @@ -91,6 +97,7 @@ class Version extends BaseAdminController /** * 设置状态 + * @description 设置状态 * @param int $id * @param $status * @return Response @@ -103,6 +110,7 @@ class Version extends BaseAdminController /** * 小程序包上传 + * @description 小程序包上传 * @return Response * @throws Exception */ diff --git a/niucloud/app/adminapi/controller/applet/VersionDownload.php b/niucloud/app/adminapi/controller/applet/VersionDownload.php index 68133e70f..49a1e7e8c 100644 --- a/niucloud/app/adminapi/controller/applet/VersionDownload.php +++ b/niucloud/app/adminapi/controller/applet/VersionDownload.php @@ -17,12 +17,14 @@ use think\response\File; /** * 小程序版本下载控制器 + * @description 小程序版本下载 */ class VersionDownload extends BaseAdminController { /** * 下载 + * @description 下载 * @param $id * @return File */ diff --git a/niucloud/app/adminapi/controller/auth/Auth.php b/niucloud/app/adminapi/controller/auth/Auth.php index c0428ebf8..d4dd4e2e3 100644 --- a/niucloud/app/adminapi/controller/auth/Auth.php +++ b/niucloud/app/adminapi/controller/auth/Auth.php @@ -20,11 +20,18 @@ use think\db\exception\ModelNotFoundException; use think\Response; +/** + * 用户管理 + * Class Auth + * @description 用户管理 + * @package app\adminapi\controller\auth + */ class Auth extends BaseAdminController { /** * 登录用户菜单列表的接口 + * @description 登录用户菜单列表 */ public function authMenuList() { @@ -36,6 +43,7 @@ class Auth extends BaseAdminController /** * 获取当前站点支持的应用 + * @description 获取当前站点支持的应用 * @return Response * @throws DataNotFoundException * @throws DbException @@ -48,6 +56,7 @@ class Auth extends BaseAdminController /** * 获取登录用户信息 + * @description 获取登录用户信息 * @return Response */ public function get() @@ -57,6 +66,7 @@ class Auth extends BaseAdminController /** * 修改登录用户信息 + * @description 修改登录用户信息 * @param $field * @return Response */ @@ -73,6 +83,7 @@ class Auth extends BaseAdminController /** * 更新用户 + * @description 更新用户 */ public function edit() { @@ -88,6 +99,7 @@ class Auth extends BaseAdminController /** * 获取当前登录站点信息 + * @description 获取当前登录站点信息 * @return Response */ public function site() @@ -97,6 +109,7 @@ class Auth extends BaseAdminController /** * 选择可以选择的页面 + * @description 选择可以选择的页面 * @return Response * @throws DataNotFoundException * @throws DbException diff --git a/niucloud/app/adminapi/controller/channel/H5.php b/niucloud/app/adminapi/controller/channel/H5.php index 428649e07..422a31fe8 100644 --- a/niucloud/app/adminapi/controller/channel/H5.php +++ b/niucloud/app/adminapi/controller/channel/H5.php @@ -15,10 +15,16 @@ use app\service\admin\channel\H5Service; use core\base\BaseAdminController; use think\Response; +/** + * H5配置 + * Class H5 + * @package app\adminapi\controller\channel + */ class H5 extends BaseAdminController { /** * 获取H5配置信息 + * @description 获取H5配置信息 * @return Response */ public function get() @@ -28,6 +34,7 @@ class H5 extends BaseAdminController /** * 设置H5配置信息 + * @description 设置H5配置信息 * @return Response */ public function set() diff --git a/niucloud/app/adminapi/controller/channel/Pc.php b/niucloud/app/adminapi/controller/channel/Pc.php index 51beedbc0..7e0e15d51 100644 --- a/niucloud/app/adminapi/controller/channel/Pc.php +++ b/niucloud/app/adminapi/controller/channel/Pc.php @@ -15,10 +15,17 @@ use app\service\admin\channel\PcService; use core\base\BaseAdminController; use think\Response; +/** + * PC端配置 + * Class Pc + * @description PC端配置 + * @package app\adminapi\controller\channel + */ class Pc extends BaseAdminController { /** * 获取PC配置信息 + * @description 获取PC配置信息 * @return Response */ public function get() @@ -28,6 +35,7 @@ class Pc extends BaseAdminController /** * 设置PC配置信息 + * @description 设置PC配置信息 * @return Response */ public function set() diff --git a/niucloud/app/adminapi/controller/dict/Dict.php b/niucloud/app/adminapi/controller/dict/Dict.php index 5a07fd3e9..384e5822d 100644 --- a/niucloud/app/adminapi/controller/dict/Dict.php +++ b/niucloud/app/adminapi/controller/dict/Dict.php @@ -18,12 +18,14 @@ use app\service\admin\dict\DictService; /** * 数据字典控制器 * Class Dict + * @description 数据字典 * @package app\adminapi\controller\dict */ class Dict extends BaseAdminController { /** * 获取数据字典列表 + * @description 获取数据字典列表 * @return \think\Response */ public function lists(){ @@ -36,6 +38,7 @@ class Dict extends BaseAdminController /** * 数据字典详情 + * @description 数据字典详情 * @param int $id * @return \think\Response */ @@ -45,6 +48,7 @@ class Dict extends BaseAdminController /** * 添加数据字典 + * @description 添加数据字典 * @return \think\Response */ public function add(){ @@ -61,6 +65,7 @@ class Dict extends BaseAdminController /** * 数据字典编辑 + * @description 数据字典编辑 * @param $id 数据字典id * @return \think\Response */ @@ -77,6 +82,7 @@ class Dict extends BaseAdminController /** * 数据字典删除 + * @description 数据字典删除 * @param $id 数据字典id * @return \think\Response */ @@ -87,6 +93,7 @@ class Dict extends BaseAdminController /** * 添加数据字典内容 + * @description 添加数据字典内容 */ public function addDictData($id) { @@ -101,6 +108,7 @@ class Dict extends BaseAdminController /** * 获取全部数据字典 + * @description 获取全部数据字典 * @return \think\Response */ public function getAll(){ @@ -109,6 +117,7 @@ class Dict extends BaseAdminController /** * 数据字典详情 + * @description 数据字典详情 * @param key 数据字典关键字 * @return \think\Response */ diff --git a/niucloud/app/adminapi/controller/diy/Config.php b/niucloud/app/adminapi/controller/diy/Config.php index f00732f7d..38c0c4113 100644 --- a/niucloud/app/adminapi/controller/diy/Config.php +++ b/niucloud/app/adminapi/controller/diy/Config.php @@ -19,12 +19,14 @@ use think\Response; /** * 自定义配置相关 * Class Config + * @description 自定义配置 * @package app\adminapi\controller\diy */ class Config extends BaseAdminController { /** * 获取底部导航列表 + * @description 获取底部导航列表 * @return Response */ public function getBottomList() @@ -34,6 +36,7 @@ class Config extends BaseAdminController /** * 获取底部导航 + * @description 获取底部导航 * @return Response */ public function getBottomConfig() @@ -46,6 +49,7 @@ class Config extends BaseAdminController /** * 设置底部导航 + * @description 设置底部导航 * @return Response */ public function setBottomConfig() diff --git a/niucloud/app/adminapi/controller/diy/Diy.php b/niucloud/app/adminapi/controller/diy/Diy.php index 38e9c1f20..f9f74ad2c 100644 --- a/niucloud/app/adminapi/controller/diy/Diy.php +++ b/niucloud/app/adminapi/controller/diy/Diy.php @@ -24,12 +24,14 @@ use think\Response; /** * 自定义页面控制器 * Class DiyController + * @description 自定义页面 * @package app\adminapi\controller\diy */ class Diy extends BaseAdminController { /** - * @notes 获取自定义页面分页列表 + * 获取自定义页面分页列表 + * @description 获取自定义页面分页列表 * @return Response */ public function lists() @@ -44,7 +46,8 @@ class Diy extends BaseAdminController } /** - * @notes 获取自定义页面分页列表，轮播搜索组件用 + * 获取自定义页面分页列表，轮播搜索组件用 + * @description 获取自定义页面分页列表，轮播搜索组件用 * @return Response */ public function getPageByCarouselSearch() @@ -53,7 +56,8 @@ class Diy extends BaseAdminController } /** - * @notes 获取自定义页面列表 + * 获取自定义页面列表 + * @description 获取自定义页面列表 * @return Response * @throws DataNotFoundException * @throws DbException @@ -71,6 +75,7 @@ class Diy extends BaseAdminController /** * 自定义页面详情 + * @description 自定义页面详情 * @param int $id * @return Response */ @@ -81,6 +86,7 @@ class Diy extends BaseAdminController /** * 添加自定义页面 + * @description 添加自定义页面 * @return Response */ public function add() @@ -104,6 +110,7 @@ class Diy extends BaseAdminController /** * 自定义页面编辑 + * @description 自定义页面编辑 * @param $id * @return Response */ @@ -126,6 +133,7 @@ class Diy extends BaseAdminController /** * 自定义页面删除 + * @description 自定义页面删除 * @param int $id * @return Response */ @@ -137,6 +145,7 @@ class Diy extends BaseAdminController /** * 设为使用 + * @description 设为使用 * @param $id * @return Response * @throws Exception @@ -149,6 +158,7 @@ class Diy extends BaseAdminController /** * 获取页面初始化数据 + * @description 获取页面初始化数据 * @return Response */ public function getPageInit() @@ -166,6 +176,7 @@ class Diy extends BaseAdminController /** * 获取自定义链接列表 + * @description 获取自定义链接列表 */ public function getLink() { @@ -175,6 +186,7 @@ class Diy extends BaseAdminController /** * 获取页面模板 + * @description 获取页面模板 * @return Response */ public function getTemplate() @@ -192,6 +204,7 @@ class Diy extends BaseAdminController /** * 修改页面分享内容 + * @description 修改页面分享内容 * @param int $id * @return Response */ @@ -206,6 +219,7 @@ class Diy extends BaseAdminController /** * 获取装修页面列表 + * @description 获取装修页面列表 */ public function getDecoratePage() { @@ -217,6 +231,7 @@ class Diy extends BaseAdminController /** * 切换模板 + * @description 切换模板 */ public function changeTemplate() { @@ -234,6 +249,7 @@ class Diy extends BaseAdminController /** * 获取模板页面列表 + * @description 获取模板页面列表 * @return Response */ public function getTemplatePages() @@ -248,6 +264,7 @@ class Diy extends BaseAdminController /** * 获取模板页面（存在的应用插件列表） + * @description 获取模板页面（存在的应用插件列表） * @return Response */ public function getApps() @@ -257,6 +274,7 @@ class Diy extends BaseAdminController /** * 复制模版 + * @description 复制模版 * @return Response */ public function copy() @@ -270,6 +288,7 @@ class Diy extends BaseAdminController /** * 获取主题风格列表 + * @description 获取主题风格列表 * @return Response */ public function getDiyTheme() @@ -279,6 +298,7 @@ class Diy extends BaseAdminController /** * 设置主题风格 + * @description 设置主题风格 * @return Response */ public function setDiyTheme() @@ -296,6 +316,7 @@ class Diy extends BaseAdminController /** * 获取主题配色列表 + * @description 获取主题配色列表 * @return Response */ public function getDefaultThemeColor() @@ -308,6 +329,7 @@ class Diy extends BaseAdminController /** * 添加自定义主题配色 + * @description 添加自定义主题配色 * @return Response */ public function addDiyTheme() @@ -326,6 +348,7 @@ class Diy extends BaseAdminController /** * 编辑自定义主题配色 + * @description 编辑自定义主题配色 * @param $id * @return Response */ @@ -345,6 +368,7 @@ class Diy extends BaseAdminController /** * 删除自定义主题配色 + * @description 删除自定义主题配色 * @param $id * @return Response */ diff --git a/niucloud/app/adminapi/controller/diy/DiyForm.php b/niucloud/app/adminapi/controller/diy/DiyForm.php index fe2d7372b..4878bce2a 100644 --- a/niucloud/app/adminapi/controller/diy/DiyForm.php +++ b/niucloud/app/adminapi/controller/diy/DiyForm.php @@ -24,12 +24,14 @@ use think\Response; /** * 万能表单控制器 * Class DiyForm + * @description 万能表单 * @package app\adminapi\controller\diy */ class DiyForm extends BaseAdminController { /** - * @notes 获取万能表单分页列表 + * 获取万能表单分页列表 + * @description 获取万能表单分页列表 * @return Response */ public function pages() @@ -43,7 +45,8 @@ class DiyForm extends BaseAdminController } /** - * @notes 获取万能表单分页列表（用于弹框选择） + * 获取万能表单分页列表（用于弹框选择） + * @description 获取万能表单分页列表（用于弹框选择） * @return Response */ public function select() @@ -58,7 +61,8 @@ class DiyForm extends BaseAdminController } /** - * @notes 获取万能表单列表 + * 获取万能表单列表 + * @description 获取万能表单列表 * @return Response * @throws DataNotFoundException * @throws DbException @@ -77,6 +81,7 @@ class DiyForm extends BaseAdminController /** * 万能表单详情 + * @description 万能表单详情 * @param int $id * @return Response */ @@ -87,6 +92,7 @@ class DiyForm extends BaseAdminController /** * 添加万能表单 + * @description 添加万能表单 * @return Response */ public function add() @@ -105,6 +111,7 @@ class DiyForm extends BaseAdminController /** * 万能表单编辑 + * @description 万能表单编辑 * @param $id * @return Response */ @@ -124,6 +131,7 @@ class DiyForm extends BaseAdminController /** * 万能表单删除 + * @description 万能表单删除 * @return Response */ public function del() @@ -137,6 +145,7 @@ class DiyForm extends BaseAdminController /** * 获取万能表单初始化数据 + * @description 获取万能表单初始化数据 * @return Response * @throws DbException */ @@ -153,6 +162,7 @@ class DiyForm extends BaseAdminController /** * 获取万能表单模板 + * @description 获取万能表单模板 * @return Response */ public function getTemplate() @@ -167,6 +177,7 @@ class DiyForm extends BaseAdminController /** * 修改页面分享内容 + * @description 修改页面分享内容 * @return Response */ public function modifyShare() @@ -181,6 +192,7 @@ class DiyForm extends BaseAdminController /** * 获取模板页面（存在的应用插件列表） + * @description 获取模板页面（存在的应用插件列表） * @return Response */ public function getApps() @@ -189,7 +201,8 @@ class DiyForm extends BaseAdminController } /** - * 复制模版 todo 靠后 + * 复制万能表单 + * @description 复制万能表单 * @return Response */ public function copy() @@ -203,6 +216,7 @@ class DiyForm extends BaseAdminController /** * 获取模板页面（存在的应用插件列表） + * @description 获取模板页面（存在的应用插件列表） * @return Response */ public function getFormType() @@ -212,6 +226,7 @@ class DiyForm extends BaseAdminController /** * 修改状态 + * @description 修改状态 * @return \think\Response */ public function modifyStatus() @@ -226,6 +241,7 @@ class DiyForm extends BaseAdminController /** * 获取使用记录 + * @description 获取使用记录 * @return Response */ public function getRecordPages() @@ -240,6 +256,7 @@ class DiyForm extends BaseAdminController /** * 获取使用记录详情 + * @description 获取使用记录详情 * @param int $record_id * @return Response */ @@ -250,6 +267,7 @@ class DiyForm extends BaseAdminController /** * 使用记录删除 + * @description 使用记录删除 * @return Response */ public function delRecord() @@ -264,6 +282,7 @@ class DiyForm extends BaseAdminController /** * 获取万能表单字段记录 + * @description 获取万能表单字段记录 * @return Response */ public function getFieldsList() @@ -278,6 +297,7 @@ class DiyForm extends BaseAdminController /** * 获取表单填写配置 + * @description 获取表单填写配置 * @param $form_id int 所属万能表单id * @return Response */ @@ -288,6 +308,7 @@ class DiyForm extends BaseAdminController /** * 编辑表单填写配置 + * @description 编辑表单填写配置 * @return Response */ public function editWriteConfig() @@ -314,6 +335,7 @@ class DiyForm extends BaseAdminController /** * 获取表单提交成功 也配置 + * @description 获取表单提交成功页配置 * @param $form_id int 所属万能表单id * @return Response */ @@ -324,6 +346,7 @@ class DiyForm extends BaseAdminController /** * 编辑表单提交成功页配置 + * @description 编辑表单提交成功页配置 * @return Response */ public function editSubmitConfig() @@ -347,6 +370,7 @@ class DiyForm extends BaseAdminController /** * 获取万能表单填表人统计列表 + * @description 获取万能表单填表人统计列表 * @return Response */ public function memberStatPages() @@ -360,6 +384,7 @@ class DiyForm extends BaseAdminController /** * 获取万能表单字段统计列表 + * @description 获取万能表单字段统计列表 * @return Response */ public function fieldStatList() diff --git a/niucloud/app/adminapi/controller/diy/DiyRoute.php b/niucloud/app/adminapi/controller/diy/DiyRoute.php index 2f0c81a92..4d7deeb05 100644 --- a/niucloud/app/adminapi/controller/diy/DiyRoute.php +++ b/niucloud/app/adminapi/controller/diy/DiyRoute.php @@ -19,12 +19,14 @@ use think\Response; /** * 自定义路由表控制器 * Class DiyRouteController + * @description 自定义路由 * @package app\adminapi\controller\diy */ class DiyRoute extends BaseAdminController { /** - * @notes 获取自定义路由表列表 + * 获取自定义路由表列表 + * @description 获取自定义路由表列表 * @return Response */ public function lists() @@ -39,6 +41,7 @@ class DiyRoute extends BaseAdminController /** * 自定义路由表详情 + * @description 自定义路由表详情 * @param int $id * @return Response */ @@ -49,6 +52,7 @@ class DiyRoute extends BaseAdminController /** * 自定义路由表详情 + * @description 自定义路由表详情 * @param string $name * @return Response */ @@ -59,6 +63,7 @@ class DiyRoute extends BaseAdminController /** * 添加自定义路由表 + * @description 添加自定义路由表 * @return Response */ public function add() @@ -77,6 +82,7 @@ class DiyRoute extends BaseAdminController /** * 自定义路由表编辑 + * @description 自定义路由表编辑 * @param $id * @return Response */ @@ -96,6 +102,7 @@ class DiyRoute extends BaseAdminController /** * 自定义路由表删除 + * @description 自定义路由表删除 * @param int $id * @return Response */ @@ -107,6 +114,7 @@ class DiyRoute extends BaseAdminController /** * 修改页面分享内容 + * @description 修改页面分享内容 */ public function modifyShare() { @@ -125,6 +133,7 @@ class DiyRoute extends BaseAdminController /** * 获取模板页面（存在的应用插件列表） + * @description 获取模板页面（存在的应用插件列表） * @return Response */ public function getApps() diff --git a/niucloud/app/adminapi/controller/generator/Generator.php b/niucloud/app/adminapi/controller/generator/Generator.php index 12fbebdb7..eff1e91ba 100644 --- a/niucloud/app/adminapi/controller/generator/Generator.php +++ b/niucloud/app/adminapi/controller/generator/Generator.php @@ -22,12 +22,14 @@ use think\Response; /** * 代码生成-控制器 * Class Generate + * @description 代码生成器 * @package app\adminapi\controller\generate */ class Generator extends BaseController { /** * 代码生成器列表 + * @description 代码生成器列表 * @return Response */ public function lists() @@ -43,6 +45,7 @@ class Generator extends BaseController /** * 代码生成详情 + * @description 代码生成详情 * @param int $id * @return Response * @throws DataNotFoundException @@ -56,6 +59,7 @@ class Generator extends BaseController /** * 代码预览 + * @description 代码预览 * @param int $id * @return Response */ @@ -68,6 +72,7 @@ class Generator extends BaseController /** * 添加代码生成 + * @description 添加代码生成 * @return Response * @throws Exception */ @@ -83,6 +88,7 @@ class Generator extends BaseController /** * 代码生成编辑 + * @description 代码生成编辑 * @param $id * @return Response */ @@ -111,6 +117,7 @@ class Generator extends BaseController /** * 代码生成删除 + * @description 代码生成删除 * @param int $id * @return Response */ @@ -122,6 +129,7 @@ class Generator extends BaseController /** * 生成代码 + * @description 生成代码 * @return Response */ public function create() @@ -137,6 +145,7 @@ class Generator extends BaseController /** * 获取数据表列表 + * @description 获取数据表列表 * @return Response */ public function tableList() @@ -151,6 +160,7 @@ class Generator extends BaseController /** * 代码生成检测 + * @description 代码生成检测 */ public function checkFile() { @@ -163,6 +173,7 @@ class Generator extends BaseController /** * 获取表字段 + * @description 获取表字段 */ public function getTableColumn() { @@ -172,9 +183,9 @@ class Generator extends BaseController return success((new GenerateService())->getTableColumn($data)); } - /** * 获取全部模型 + * @description 获取全部模型 */ public function getModels() { @@ -186,6 +197,7 @@ class Generator extends BaseController /** * 根据模型获取表字段 + * @description 根据模型获取表字段 */ public function getModelTableColumn() { diff --git a/niucloud/app/adminapi/controller/home/Site.php b/niucloud/app/adminapi/controller/home/Site.php index 38f194b24..cda5e5f23 100644 --- a/niucloud/app/adminapi/controller/home/Site.php +++ b/niucloud/app/adminapi/controller/home/Site.php @@ -15,10 +15,17 @@ use app\service\admin\home\AuthSiteService; use core\base\BaseAdminController; use think\Response; +/** + * 站点管理 + * Class Site + * @description 站点管理 + * @package app\adminapi\controller\home + */ class Site extends BaseAdminController { /** * 站点列表 + * @description 站点列表 * @return Response */ public function lists() @@ -34,6 +41,7 @@ class Site extends BaseAdminController /** * 站点详情 + * @description 站点详情 * @param int $id * @return Response */ @@ -44,6 +52,7 @@ class Site extends BaseAdminController /** * 站点更新 + * @description 站点更新 */ public function edit($id) { @@ -74,12 +83,33 @@ class Site extends BaseAdminController return success('MODIFY_SUCCESS'); } + /** + * 获取站点分组列表 + * @description 站点分组列表 + * @return Response + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException + */ public function getSiteGroup() { return success((new AuthSiteService())->getSiteGroup()); } + /** + * 获取站点分组应用列表 + * @description 站点分组应用列表 + * @return Response + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException + */ + public function getSiteGroupAppList() { + return success((new AuthSiteService())->getSiteGroupAppList()); + } + /** * 创建站点 + * @description 创建站点 * @return Response */ public function create() { diff --git a/niucloud/app/adminapi/controller/login/Captcha.php b/niucloud/app/adminapi/controller/login/Captcha.php index 1455e0c38..441d8d9a6 100644 --- a/niucloud/app/adminapi/controller/login/Captcha.php +++ b/niucloud/app/adminapi/controller/login/Captcha.php @@ -15,12 +15,18 @@ use app\service\admin\captcha\CaptchaService; use core\base\BaseAdminController; use think\Response; +/** + * 验证码 + * Class Captcha + * @description 验证码 + * @package app\adminapi\controller\login + */ class Captcha extends BaseAdminController { - /** * 创建验证码 + * @description 创建验证码 * @return Response */ public function create() @@ -30,6 +36,7 @@ class Captcha extends BaseAdminController /** * 一次校验验证码 + * @description 一次校验验证码 * @return Response */ public function check() @@ -39,6 +46,7 @@ class Captcha extends BaseAdminController /** * 二次校验验证码 + * @description 二次校验验证码 * @return Response */ public function verification() diff --git a/niucloud/app/adminapi/controller/login/Config.php b/niucloud/app/adminapi/controller/login/Config.php index 68782788e..cd4928234 100644 --- a/niucloud/app/adminapi/controller/login/Config.php +++ b/niucloud/app/adminapi/controller/login/Config.php @@ -15,12 +15,18 @@ use app\service\admin\auth\ConfigService; use core\base\BaseAdminController; use think\Response; - +/** + * 登录设置 + * Class Config + * @description 登录设置 + * @package app\adminapi\controller\login + */ class Config extends BaseAdminController { /** * 获取登录设置 + * @description 获取登录设置 * @return Response */ public function getConfig() @@ -30,6 +36,7 @@ class Config extends BaseAdminController /** * 注册与登录设置 + * @description 注册与登录设置 * @return Response */ public function setConfig() diff --git a/niucloud/app/adminapi/controller/login/Login.php b/niucloud/app/adminapi/controller/login/Login.php index 7616f4a13..035887685 100644 --- a/niucloud/app/adminapi/controller/login/Login.php +++ b/niucloud/app/adminapi/controller/login/Login.php @@ -17,12 +17,19 @@ use app\service\core\addon\WapTrait; use core\base\BaseAdminController; use think\Response; +/** + * 登录 + * Class Login + * @description 登录 + * @package app\adminapi\controller\login + */ class Login extends BaseAdminController { use WapTrait; /** * 登录 + * @description 登录 * @return Response */ public function login($app_type) @@ -44,7 +51,8 @@ class Login extends BaseAdminController } /** - * 登出 + * 退出登录 + * @description 退出登录 * @return Response */ public function logout() @@ -55,6 +63,7 @@ class Login extends BaseAdminController /** * 获取登录设置 + * @description 获取登录设置 * @return Response */ public function getConfig() diff --git a/niucloud/app/adminapi/controller/member/Account.php b/niucloud/app/adminapi/controller/member/Account.php index 861418da3..096900ecc 100644 --- a/niucloud/app/adminapi/controller/member/Account.php +++ b/niucloud/app/adminapi/controller/member/Account.php @@ -17,10 +17,17 @@ use app\service\admin\member\MemberService; use core\base\BaseAdminController; use think\Response; +/** + * 会员账户 + * Class Account + * @description 会员账户 + * @package app\adminapi\controller\member + */ class Account extends BaseAdminController { /** * 积分流水 + * @description 积分流水 * @return Response */ public function point() @@ -37,6 +44,7 @@ class Account extends BaseAdminController /** * 会员积分统计（用于会员积分统计窗口） + * @description 会员积分统计（用于会员积分统计窗口） */ public function sumPoint() { @@ -64,6 +72,7 @@ class Account extends BaseAdminController /** * 余额流水 + * @description 余额流水 * @return Response */ public function balance() @@ -80,6 +89,7 @@ class Account extends BaseAdminController /** * 可提现余额流水 + * @description 可提现余额流水 * @return Response */ public function money() @@ -96,6 +106,7 @@ class Account extends BaseAdminController /** * 查询成长值 + * @description 查询成长值 * @return Response */ public function growth() @@ -112,6 +123,7 @@ class Account extends BaseAdminController /** * 积分账户调整 + * @description 积分账户调整 */ public function adjustPoint() { @@ -126,6 +138,7 @@ class Account extends BaseAdminController /** * 余额账户调整 + * @description 余额账户调整 */ public function adjustBalance() { @@ -140,6 +153,7 @@ class Account extends BaseAdminController /** * 零钱调整 + * @description 零钱调整 * @return Response */ public function adjustMoney() @@ -155,6 +169,7 @@ class Account extends BaseAdminController /** * 会员佣金 + * @description 会员佣金 * @return Response */ public function commission() @@ -171,6 +186,7 @@ class Account extends BaseAdminController /** * 会员佣金统计（用于会员账户统计窗口） + * @description 会员佣金统计（用于会员账户统计窗口） */ public function sumCommission() { @@ -202,6 +218,7 @@ class Account extends BaseAdminController /** * 会员余额统计（用于会员账户统计窗口） + * @description 会员余额统计（用于会员账户统计窗口） */ public function sumBalance() { @@ -223,6 +240,7 @@ class Account extends BaseAdminController /** * 账户变化类型 + * @description 账户变化类型 * @param string $account_type * @return Response */ @@ -234,6 +252,7 @@ class Account extends BaseAdminController /** * 账户类型 + * @description 账户类型 */ public function accountType() { diff --git a/niucloud/app/adminapi/controller/member/Address.php b/niucloud/app/adminapi/controller/member/Address.php index b98079a7a..532d9b3d8 100644 --- a/niucloud/app/adminapi/controller/member/Address.php +++ b/niucloud/app/adminapi/controller/member/Address.php @@ -17,11 +17,13 @@ use core\base\BaseAdminController; /** * 会员收货地址控制器 + * @description 会员收货地址 */ class Address extends BaseAdminController { /** * 获取会员收货地址列表 + * @description 获取会员收货地址列表 * @return \think\Response */ public function lists(){ @@ -33,6 +35,7 @@ class Address extends BaseAdminController /** * 会员收货地址详情 + * @description 会员收货地址详情 * @param $id 会员收货地址id * @return \think\Response */ @@ -45,6 +48,7 @@ class Address extends BaseAdminController /** * 添加会员收货地址 + * @description 添加会员收货地址 * @return \think\Response */ public function add(){ @@ -68,6 +72,7 @@ class Address extends BaseAdminController /** * 会员收货地址编辑 + * @description 会员收货地址编辑 * @param $id 会员收货地址id * @return \think\Response */ diff --git a/niucloud/app/adminapi/controller/member/CashOut.php b/niucloud/app/adminapi/controller/member/CashOut.php index 2179a4a59..d1611182a 100644 --- a/niucloud/app/adminapi/controller/member/CashOut.php +++ b/niucloud/app/adminapi/controller/member/CashOut.php @@ -17,10 +17,17 @@ use app\service\admin\member\MemberCashOutService; use core\base\BaseAdminController; use think\Response; +/** + * 提现 + * Class CashOut + * @description 提现 + * @package app\adminapi\controller\member + */ class CashOut extends BaseAdminController { /** * 提现列表 + * @description 提现列表 * @return Response */ public function lists() @@ -40,6 +47,7 @@ class CashOut extends BaseAdminController /** * 提现详情 + * @description 提现详情 * @param int $id * @return Response */ @@ -48,6 +56,13 @@ class CashOut extends BaseAdminController return success((new MemberCashOutService())->getInfo($id)); } + /** + * 提现申请 + * @description 提现申请 + * @param $id + * @param $action + * @return Response + */ public function audit($id, $action) { $data = $this->request->params([ @@ -59,6 +74,7 @@ class CashOut extends BaseAdminController /** * 转账方式 + * @description 转账方式 * @return Response */ public function getTransferType() @@ -68,6 +84,7 @@ class CashOut extends BaseAdminController /** * 转账方式 + * @description 转账方式 * @param $id * @return Response */ @@ -84,6 +101,7 @@ class CashOut extends BaseAdminController /** * 备注转账信息 + * @description 备注转账信息 * @param $id * @return Response */ @@ -97,6 +115,7 @@ class CashOut extends BaseAdminController } /** * 状态 + * @description 状态 * @return Response */ public function getStatusList() @@ -106,6 +125,7 @@ class CashOut extends BaseAdminController /** * 统计数据 + * @description 统计数据 */ public function stat() { @@ -114,6 +134,7 @@ class CashOut extends BaseAdminController /** * 校验数组是否 + * @description 校验数组是否 * @return void */ public function checkTransferStatus($id){ @@ -123,6 +144,7 @@ class CashOut extends BaseAdminController /** * 取消 + * @description 取消 * @param $id * @return void */ diff --git a/niucloud/app/adminapi/controller/member/Config.php b/niucloud/app/adminapi/controller/member/Config.php index a7fb34857..f129ca20c 100644 --- a/niucloud/app/adminapi/controller/member/Config.php +++ b/niucloud/app/adminapi/controller/member/Config.php @@ -16,10 +16,17 @@ use app\service\admin\member\MemberService; use core\base\BaseAdminController; use think\Response; +/** + * 会员设置 + * Class Config + * @description 会员设置 + * @package app\adminapi\controller\member + */ class Config extends BaseAdminController { /** * 获取登录设置 + * @description 获取登录设置 * @return Response */ public function getLoginConfig() @@ -29,6 +36,7 @@ class Config extends BaseAdminController /** * 注册与登录设置 + * @description 设置注册与登录配置 * @return Response */ public function setLoginConfig() @@ -50,6 +58,7 @@ class Config extends BaseAdminController /** * 获取提现设置 + * @description 获取提现设置 * @return Response */ public function getCashOutConfig() @@ -59,6 +68,7 @@ class Config extends BaseAdminController /** * 提现设置 + * @description 设置提现设置 * @return Response */ public function setCashOutConfig() @@ -78,6 +88,7 @@ class Config extends BaseAdminController /** * 获取会员配置 + * @description 获取会员配置 * @return Response */ public function getMemberConfig() @@ -87,13 +98,15 @@ class Config extends BaseAdminController /** * 设置会员配置 + * @description 设置会员配置 * @return Response */ public function setMemberConfig() { $data = $this->request->params([ [ 'prefix', '' ], - [ 'length', 10 ] + [ 'length', 10 ], + [ 'form_id', '' ], ]); $this->validate($data, 'app\validate\member\MemberConfig.set'); ( new MemberConfigService() )->setMemberConfig($data); @@ -102,6 +115,7 @@ class Config extends BaseAdminController /** * 获取成长值规则配置 + * @description 获取成长值规则配置 * @return Response */ public function getGrowthRuleConfig() @@ -111,6 +125,7 @@ class Config extends BaseAdminController /** * 配置成长值规则 + * @description 配置成长值规则 * @return Response */ public function setGrowthRuleConfig() @@ -127,6 +142,7 @@ class Config extends BaseAdminController /** * 获取积分规则配置 + * @description 获取积分规则配置 * @return Response */ public function getPointRuleConfig() @@ -136,6 +152,7 @@ class Config extends BaseAdminController /** * 配置积分规则 + * @description 配置积分规则 * @return Response */ public function setPointRuleConfig() diff --git a/niucloud/app/adminapi/controller/member/Member.php b/niucloud/app/adminapi/controller/member/Member.php index 34f42b59a..0e0ba8d58 100644 --- a/niucloud/app/adminapi/controller/member/Member.php +++ b/niucloud/app/adminapi/controller/member/Member.php @@ -21,10 +21,17 @@ use think\db\exception\DbException; use think\db\exception\ModelNotFoundException; use think\Response; +/** + * 会员管理 + * Class Member + * @description 会员管理 + * @package app\adminapi\controller\member + */ class Member extends BaseAdminController { /** * 会员列表 + * @description 会员列表 * @return Response */ public function lists() @@ -42,6 +49,7 @@ class Member extends BaseAdminController /** * 会员详情 + * @description 会员详情 * @param int $id * @return Response */ @@ -52,6 +60,7 @@ class Member extends BaseAdminController /** * 添加会员 + * @description 添加会员 * @return Response */ public function add() @@ -76,6 +85,7 @@ class Member extends BaseAdminController /** * 修改会员 + * @description 修改会员 * @param $member_id * @param $field * @return Response @@ -95,6 +105,7 @@ class Member extends BaseAdminController /** * 更新 + * @description 更新 * @return Response */ public function edit($member_id) @@ -112,6 +123,12 @@ class Member extends BaseAdminController return success('EDIT_SUCCESS'); } + /** + * 删除会员 + * @description 删除会员 + * @param $member_id + * @return Response + */ public function del($member_id) { $res = (new MemberService())->deleteMember($member_id); @@ -120,6 +137,7 @@ class Member extends BaseAdminController /** * 导出会员列表 + * @description 导出会员列表 * @return Response */ public function export() @@ -137,6 +155,7 @@ class Member extends BaseAdminController /** * 会员使用场景 + * @description 会员使用场景 * @return Response */ public function getMemberRegisterType() @@ -146,6 +165,7 @@ class Member extends BaseAdminController /** * 会员列表 + * @description 会员列表 * @return Response * @throws DataNotFoundException * @throws DbException @@ -162,6 +182,7 @@ class Member extends BaseAdminController /** * 获取会员注册渠道 + * @description 获取会员注册渠道 * @return Response */ public function getMemberRegisterChannelType() @@ -171,6 +192,7 @@ class Member extends BaseAdminController /** * 设置会员的状态 + * @description 设置会员的状态 * @param $status * @return Response */ @@ -187,6 +209,7 @@ class Member extends BaseAdminController /** * 获取状态枚举 + * @description 获取状态枚举 * @return Response */ public function getStatusList() @@ -196,6 +219,7 @@ class Member extends BaseAdminController /** * 获取会员编码 + * @description 获取会员编码 * @return Response */ public function getMemberNo() @@ -206,55 +230,85 @@ class Member extends BaseAdminController /** * 获取会员权益字典 + * @description 获取会员权益字典 * @return mixed */ - public function getMemberBenefitsDict() { + public function getMemberBenefitsDict() + { return success((new MemberService())->getMemberBenefitsDict()); } /** * 获取会员礼包字典 + * @description 获取会员礼包字典 * @return array|null */ - public function getMemberGiftDict() { + public function getMemberGiftDict() + { return success((new MemberService())->getMemberGiftDict()); } /** * 获取成长值规则字典 + * @description 获取成长值规则字典 * @return array|null */ - public function getGrowthRuleDict() { + public function getGrowthRuleDict() + { return success((new MemberService())->getGrowthRuleDict()); } /** * 获取积分规则字典 + * @description 获取积分规则字典 * @return array|null */ - public function getPointRuleDict() { + public function getPointRuleDict() + { return success((new MemberService())->getPointRuleDict()); } /** * 获取会员权益内容 + * @description 获取会员权益内容 * @return Response */ - public function getMemberBenefitsContent() { + public function getMemberBenefitsContent() + { $data = $this->request->params([ - [ 'benefits', [] ], + ['benefits', []], ]); return success((new MemberService())->getMemberBenefitsContent($data['benefits'])); } /** * 获取会员礼包内容 + * @description 获取会员礼包内容 * @return Response */ - public function getMemberGiftsContent() { + public function getMemberGiftsContent() + { $data = $this->request->params([ - [ 'gifts', [] ], + ['gifts', []], ]); return success((new MemberService())->getMemberGiftsContent($data['gifts'])); } + + /** + * 批量操作 + * @description 批量操作 + * @return Response + */ + public function batchModify() + { + $data = $this->request->params([ + ['is_all', 0], + ['where', []], + ['member_ids', []], + ['value', ''], + ['field', ''], + ]); + (new MemberService())->batchModify($data); + return success('MODIFY_SUCCESS'); + } } diff --git a/niucloud/app/adminapi/controller/member/MemberLabel.php b/niucloud/app/adminapi/controller/member/MemberLabel.php index 16ea28512..6665c6888 100644 --- a/niucloud/app/adminapi/controller/member/MemberLabel.php +++ b/niucloud/app/adminapi/controller/member/MemberLabel.php @@ -18,10 +18,17 @@ use think\db\exception\DbException; use think\db\exception\ModelNotFoundException; use think\Response; +/** + * 会员标签 + * Class MemberLabel + * @description 会员标签 + * @package app\adminapi\controller\member + */ class MemberLabel extends BaseAdminController { /** * 会员标签列表 + * @description 会员标签列表 * @return Response */ public function lists() @@ -34,6 +41,7 @@ class MemberLabel extends BaseAdminController /** * 会员标签详情 + * @description 会员标签详情 * @param int $id * @return Response */ @@ -44,6 +52,7 @@ class MemberLabel extends BaseAdminController /** * 添加会员标签 + * @description 添加会员标签 * @return Response */ public function add() @@ -61,6 +70,7 @@ class MemberLabel extends BaseAdminController /** * 编辑会员标签 + * @description 编辑会员标签 */ public function edit($id) { @@ -76,6 +86,7 @@ class MemberLabel extends BaseAdminController /** * 会员标签删除 + * @description 会员标签删除 * @param int $id * @return Response */ @@ -87,6 +98,7 @@ class MemberLabel extends BaseAdminController /** * 获取标签 + * @description 获取标签 * @return Response * @throws DataNotFoundException * @throws DbException diff --git a/niucloud/app/adminapi/controller/member/MemberLevel.php b/niucloud/app/adminapi/controller/member/MemberLevel.php index 9c75cb989..116fca5cd 100644 --- a/niucloud/app/adminapi/controller/member/MemberLevel.php +++ b/niucloud/app/adminapi/controller/member/MemberLevel.php @@ -18,10 +18,17 @@ use think\db\exception\DbException; use think\db\exception\ModelNotFoundException; use think\Response; +/** + * 会员等级 + * Class MemberLevel + * @description 会员等级 + * @package app\adminapi\controller\member + */ class MemberLevel extends BaseAdminController { /** * 会员等级分页列表 + * @description 会员等级分页列表 * @return Response */ public function pages() @@ -34,6 +41,7 @@ class MemberLevel extends BaseAdminController /** * 会员等级详情 + * @description 会员等级详情 * @param int $id * @return Response */ @@ -44,6 +52,7 @@ class MemberLevel extends BaseAdminController /** * 添加会员等级 + * @description 添加会员等级 * @return Response */ public function add() @@ -62,6 +71,7 @@ class MemberLevel extends BaseAdminController /** * 编辑会员等级 + * @description 编辑会员等级 */ public function edit($id) { @@ -79,6 +89,7 @@ class MemberLevel extends BaseAdminController /** * 会员等级删除 + * @description 会员等级删除 * @param int $id * @return Response */ @@ -90,6 +101,7 @@ class MemberLevel extends BaseAdminController /** * 获取标签 + * @description 获取标签 * @return Response * @throws DataNotFoundException * @throws DbException diff --git a/niucloud/app/adminapi/controller/member/MemberSign.php b/niucloud/app/adminapi/controller/member/MemberSign.php index 1debda6a2..add8e45ba 100644 --- a/niucloud/app/adminapi/controller/member/MemberSign.php +++ b/niucloud/app/adminapi/controller/member/MemberSign.php @@ -15,10 +15,17 @@ use app\service\admin\member\MemberSignService; use core\base\BaseAdminController; use think\Response; +/** + * 会员签到 + * Class MemberSign + * @description 会员签到 + * @package app\adminapi\controller\member + */ class MemberSign extends BaseAdminController { /** * 会员签到记录 + * @description 会员签到记录 * @return Response */ public function lists() @@ -32,6 +39,7 @@ class MemberSign extends BaseAdminController /** * 会员签到详情 + * @description 会员签到详情 * @param int $sign_id * @return Response */ @@ -40,7 +48,9 @@ class MemberSign extends BaseAdminController return success(( new MemberSignService() )->getInfo($sign_id)); } - /**设置签到设置 + /** + * 设置签到设置 + * @description 设置签到设置 * @return Response */ public function setSign() @@ -58,6 +68,7 @@ class MemberSign extends BaseAdminController /** * 获取签到设置 + * @description 获取签到设置 * @return Response */ public function getSign() diff --git a/niucloud/app/adminapi/controller/niucloud/Cloud.php b/niucloud/app/adminapi/controller/niucloud/Cloud.php index a968152f9..a088e1a10 100644 --- a/niucloud/app/adminapi/controller/niucloud/Cloud.php +++ b/niucloud/app/adminapi/controller/niucloud/Cloud.php @@ -14,10 +14,17 @@ namespace app\adminapi\controller\niucloud; use app\service\core\niucloud\CoreCloudBuildService; use core\base\BaseAdminController; +/** + * 云编译 + * Class Cloud + * @description 云编译 + * @package app\adminapi\controller\niucloud + */ class Cloud extends BaseAdminController { /** * 云编译 + * @description 云编译 * @return \think\Response */ public function build() { @@ -26,6 +33,7 @@ class Cloud extends BaseAdminController /** * 获取云编译日志 + * @description 获取云编译日志 * @return \think\Response */ public function getBuildLog() { @@ -34,6 +42,7 @@ class Cloud extends BaseAdminController /** * 获取云编译任务 + * @description 获取云编译任务 * @return \think\Response */ public function getBuildTask() { @@ -42,6 +51,7 @@ class Cloud extends BaseAdminController /** * 清除云编译任务 + * @description 清除云编译任务 * @return \think\Response */ public function clearBuildTask() { @@ -50,6 +60,7 @@ class Cloud extends BaseAdminController /** * 编译前环境检测 + * @description 编译前环境检测 * @return \think\Response */ public function buildPreCheck() { diff --git a/niucloud/app/adminapi/controller/niucloud/Module.php b/niucloud/app/adminapi/controller/niucloud/Module.php index e9ce3eaf2..1c7e9c471 100644 --- a/niucloud/app/adminapi/controller/niucloud/Module.php +++ b/niucloud/app/adminapi/controller/niucloud/Module.php @@ -16,8 +16,20 @@ use app\service\core\niucloud\CoreAuthService; use core\base\BaseAdminController; use think\Response; +/** + * 模块 + * Class Module + * @description 模块 + * @package app\adminapi\controller\niucloud + */ class Module extends BaseAdminController { + /** + * 获取授权信息 + * @description 获取授权信息 + * @return Response + * @throws \GuzzleHttp\Exception\GuzzleException + */ public function authorize() { return success(( new CoreAuthService() )->getAuthInfo()); @@ -25,6 +37,7 @@ class Module extends BaseAdminController /** * 设置 授权信息 + * @description 设置 授权信息 */ public function setAuthorize() { @@ -38,6 +51,7 @@ class Module extends BaseAdminController /** * 获取 授权信息 + * @description 获取 授权信息 */ public function getAuthorize() { @@ -46,6 +60,7 @@ class Module extends BaseAdminController /** * 获取框架最新版本 + * @description 获取框架最新版本 * @return Response * @throws \GuzzleHttp\Exception\GuzzleException */ @@ -56,6 +71,7 @@ class Module extends BaseAdminController /** * 获取框架最新版本 + * @description 获取框架最新版本 * @return Response * @throws \GuzzleHttp\Exception\GuzzleException */ @@ -66,6 +82,7 @@ class Module extends BaseAdminController /** * 获取应用/插件的版本更新记录 + * @description 获取应用/插件的版本更新记录 * @return Response */ public function getAppVersionList() diff --git a/niucloud/app/adminapi/controller/notice/NiuSms.php b/niucloud/app/adminapi/controller/notice/NiuSms.php index 2dd81f693..2712faf63 100644 --- a/niucloud/app/adminapi/controller/notice/NiuSms.php +++ b/niucloud/app/adminapi/controller/notice/NiuSms.php @@ -11,19 +11,21 @@ namespace app\adminapi\controller\notice; -use app\dict\sys\SmsDict; -use app\service\admin\notice\NoticeService; use app\service\admin\notice\NiuSmsService; -use app\service\admin\notice\SmsService; -use app\service\core\notice\CoreNiuSmsService; use core\base\BaseAdminController; -use core\exception\AdminException; use think\Response; +/** + * 牛云短信管理 + * Class NiuSms + * @description 牛云短信管理 + * @package app\adminapi\controller\notice + */ class NiuSms extends BaseAdminController { /** * 启用牛云短信 + * @description 启用牛云短信 * @return Response */ public function enable() @@ -35,9 +37,9 @@ class NiuSms extends BaseAdminController return success("SUCCESS"); } - /** * 获取基础信息 + * @description 获取基础信息 * @return Response */ public function getConfig() @@ -45,6 +47,11 @@ class NiuSms extends BaseAdminController return success((new NiuSmsService())->getConfig()); } + /** + * 获取短信套餐列表 + * @description 获取短信套餐列表 + * @return Response + */ public function getSmsPackageList() { $params = $this->request->params([ @@ -61,7 +68,11 @@ class NiuSms extends BaseAdminController return success($list); } - /*******牛云*******/ + /** + * 发送短信验证码 + * @description 发送短信验证码 + * @return Response + */ public function sendMobileCode() { $params = $this->request->params([ @@ -75,6 +86,7 @@ class NiuSms extends BaseAdminController /** * 获取图形验证码 + * @description 获取图形验证码 * @return Response */ public function captcha() @@ -85,6 +97,7 @@ class NiuSms extends BaseAdminController /** * 注册牛云短信子账号 + * @description 注册牛云短信子账号 * @return Response */ public function registerAccount() @@ -97,6 +110,19 @@ class NiuSms extends BaseAdminController ['remark', ""], ['key', ""], ['code', ""], + ['signature', ""], + + /*以下为实名信息*/ + ['contentExample', ""], + ['companyName', ""], + ['creditCode', ""], + ['legalPerson', ""], + ['principalName', ""], + ['principalIdCard', ""], + ['principalMobile', ""], + ['signSource', ""], + ['signType', ""], + ['imgUrl', ""], ]); $res = (new NiuSmsService())->registerAccount($data); return success($res); @@ -104,6 +130,7 @@ class NiuSms extends BaseAdminController /** * 登录牛云短信子账号 + * @description 登录牛云短信子账号 * @return Response */ public function loginAccount() @@ -118,22 +145,24 @@ class NiuSms extends BaseAdminController /** * 获取短信发送列表 + * @description 获取短信发送列表 * @param $username * @return Response */ public function accountSendList($username) { $params = $this->request->params([ - ['content',''], - ['mobile',''], - ['smsStatus',''] + ['content', ''], + ['mobile', ''], + ['smsStatus', ''] ]); - $data = (new NiuSmsService())->accountSendList($username,$params); + $data = (new NiuSmsService())->accountSendList($username, $params); return success($data); } /** * 获取子账户信息 + * @description 获取子账户信息 * @param $username * @return Response */ @@ -145,6 +174,7 @@ class NiuSms extends BaseAdminController /** * 修改子账户信息 + * @description 修改子账户信息 * @param $username * @return Response */ @@ -163,6 +193,7 @@ class NiuSms extends BaseAdminController /** * 重置密码 + * @description 重置密码 * @param $username * @return Response */ @@ -179,6 +210,7 @@ class NiuSms extends BaseAdminController /** * 忘记密码 + * @description 忘记密码 * @param $username * @return Response */ @@ -195,6 +227,7 @@ class NiuSms extends BaseAdminController /** * 签名列表 + * @description 签名列表 * @param $username * @return Response */ @@ -206,6 +239,7 @@ class NiuSms extends BaseAdminController /** * 签名信息 + * @description 签名信息 * @param $username * @return Response */ @@ -216,6 +250,11 @@ class NiuSms extends BaseAdminController return success($data); } + /** + * 签名创建、报备需要的配置 + * @description 签名创建、报备需要的配置 + * @return Response + */ public function signCreateConfig() { return success((new NiuSmsService())->signCreateConfig()); @@ -223,6 +262,7 @@ class NiuSms extends BaseAdminController /** * 签名创建、报备 + * @description 签名创建、报备 * @param $username * @return Response */ @@ -236,6 +276,7 @@ class NiuSms extends BaseAdminController ['legalPerson', ""], ['principalName', ""], ['principalIdCard', ""], + ['principalMobile', ""], ['signSource', ""], ['signType', ""], ['imgUrl', ""], @@ -245,6 +286,12 @@ class NiuSms extends BaseAdminController return success("SUCCESS"); } + /** + * 签名删除 + * @description 签名删除 + * @param $username + * @return Response + */ public function signDelete($username) { $params = $this->request->params([ @@ -256,6 +303,7 @@ class NiuSms extends BaseAdminController /** * 同步模版状态 + * @description 同步模版状态 * @param $sms_type * @param $username * @return Response @@ -268,6 +316,7 @@ class NiuSms extends BaseAdminController /** * 模版列表 + * @description 模版列表 * @param $sms_type * @param $username * @return Response @@ -280,6 +329,7 @@ class NiuSms extends BaseAdminController /** * 模版信息 + * @description 模版信息 * @param $sms_type * @param $username * @return Response @@ -293,6 +343,7 @@ class NiuSms extends BaseAdminController /** * 创建模版需要的配置 + * @description 创建模版需要的配置 * @return Response */ public function templateCreateConfig() @@ -302,6 +353,7 @@ class NiuSms extends BaseAdminController /** * 创建模版 + * @description 创建模版 * @param $sms_type * @param $username * @return Response @@ -318,8 +370,22 @@ class NiuSms extends BaseAdminController return success($data); } + /** + * 清除模版 + * @description 清除模版 + * @param $username + * @param $template_id + * @return Response + */ + public function templateDelete($username, $template_id) + { + (new NiuSmsService())->templateDelete($username, $template_id); + return success('DELETE_SUCCESS'); + } + /** * 创建订单 + * @description 创建订单 * @param $username * @return Response */ @@ -335,6 +401,7 @@ class NiuSms extends BaseAdminController /** * 订单计算 + * @description 订单计算 * @param $username * @return Response */ @@ -345,11 +412,11 @@ class NiuSms extends BaseAdminController ]); $data = (new NiuSmsService())->calculate($username, $params['package_id']); return success($data); - } /** * 获取支付信息 + * @description 获取支付信息 * @param $username * @return Response */ @@ -363,7 +430,8 @@ class NiuSms extends BaseAdminController } /** - * 充值、订单列表 + * 充值订单列表 + * @description 充值订单列表 * @param $username * @return Response */ @@ -375,12 +443,13 @@ class NiuSms extends BaseAdminController ['create_time_start', ''], ['create_time_end', ''], ]); - $data = (new NiuSmsService())->orderList($username,$params); + $data = (new NiuSmsService())->orderList($username, $params); return success($data); } /** * 订单详情 + * @description 订单详情 * @param $username * @return Response */ @@ -395,6 +464,7 @@ class NiuSms extends BaseAdminController /** * 订单状态 + * @description 订单状态 * @param $username * @return Response */ diff --git a/niucloud/app/adminapi/controller/notice/Notice.php b/niucloud/app/adminapi/controller/notice/Notice.php index 58de67574..0cd8b0f50 100644 --- a/niucloud/app/adminapi/controller/notice/Notice.php +++ b/niucloud/app/adminapi/controller/notice/Notice.php @@ -13,17 +13,23 @@ namespace app\adminapi\controller\notice; use app\dict\sys\SmsDict; use app\service\admin\notice\NoticeService; -use app\service\admin\notice\NiuSmsService; use app\service\admin\notice\SmsService; use core\base\BaseAdminController; use core\exception\AdminException; use think\Response; +/** + * 消息管理 + * Class Notice + * @description 消息管理 + * @package app\adminapi\controller\notice + */ class Notice extends BaseAdminController { /** * 消息列表 + * @description 消息列表 * @return Response */ public function lists() @@ -32,6 +38,12 @@ class Notice extends BaseAdminController return success($res); } + /** + * 消息详情 + * @description 消息详情 + * @param $key + * @return Response + */ public function info($key) { $res = (new NoticeService())->getInfo($key); @@ -40,6 +52,7 @@ class Notice extends BaseAdminController /** * 消息启动与关闭 + * @description 消息启动与关闭 * @return Response */ public function editStatus() @@ -55,6 +68,8 @@ class Notice extends BaseAdminController /** * 短信配置列表 + * @description 短信配置列表 + * @return Response */ public function smsList() { @@ -64,6 +79,7 @@ class Notice extends BaseAdminController /** * 短信配置详情 + * @description 短信配置详情 * @param $sms_type * @return Response */ @@ -75,6 +91,7 @@ class Notice extends BaseAdminController /** * 短信配置修改 + * @description 短信配置修改 * @return Response */ public function editSms($sms_type) @@ -97,6 +114,7 @@ class Notice extends BaseAdminController /** * 消息修改 + * @description 消息修改 * @return Response */ public function edit() diff --git a/niucloud/app/adminapi/controller/notice/NoticeLog.php b/niucloud/app/adminapi/controller/notice/NoticeLog.php index 5a4f5c63d..b2bd6bc0c 100644 --- a/niucloud/app/adminapi/controller/notice/NoticeLog.php +++ b/niucloud/app/adminapi/controller/notice/NoticeLog.php @@ -15,11 +15,18 @@ use app\service\admin\notice\NoticeLogService; use core\base\BaseAdminController; use think\Response; +/** + * 消息发送记录 + * Class NoticeLog + * @description 消息发送记录 + * @package app\adminapi\controller\notice + */ class NoticeLog extends BaseAdminController { /** * 消息发送记录列表 + * @description 消息发送记录列表 * @return Response */ public function lists() @@ -34,6 +41,12 @@ class NoticeLog extends BaseAdminController return success($res); } + /** + * 消息发送记录详情 + * @description 消息发送记录详情 + * @param $id + * @return Response + */ public function info($id) { $res = (new NoticeLogService())->getInfo($id); diff --git a/niucloud/app/adminapi/controller/notice/SmsLog.php b/niucloud/app/adminapi/controller/notice/SmsLog.php index 639caaa89..2c52b4440 100644 --- a/niucloud/app/adminapi/controller/notice/SmsLog.php +++ b/niucloud/app/adminapi/controller/notice/SmsLog.php @@ -15,11 +15,18 @@ use app\service\admin\notice\NoticeSmsLogService; use core\base\BaseAdminController; use think\Response; +/** + * 短信发送记录 + * Class SmsLog + * @description 短信发送记录 + * @package app\adminapi\controller\notice + */ class SmsLog extends BaseAdminController { /** * 短信发送记录列表 + * @description 短信发送记录列表 * @return Response */ public function lists() @@ -35,6 +42,12 @@ class SmsLog extends BaseAdminController return success($res); } + /** + * 短信发送记录详情 + * @description 短信发送记录详情 + * @param $id + * @return Response + */ public function info($id) { $res = (new NoticeSmsLogService())->getInfo($id); diff --git a/niucloud/app/adminapi/controller/pay/Pay.php b/niucloud/app/adminapi/controller/pay/Pay.php index a6199e8ca..20f5c1ce1 100644 --- a/niucloud/app/adminapi/controller/pay/Pay.php +++ b/niucloud/app/adminapi/controller/pay/Pay.php @@ -14,11 +14,17 @@ namespace app\adminapi\controller\pay; use app\service\admin\pay\PayService; use core\base\BaseAdminController; +/** + * 支付管理 + * Class Pay + * @description 支付管理 + * @package app\adminapi\controller\pay + */ class Pay extends BaseAdminController { /** * 待审核支付记录 - * @param array $where + * @description 待审核支付记录 * @return mixed */ public function audit(){ @@ -32,7 +38,8 @@ class Pay extends BaseAdminController /** * 查询详情 - * @param string $out_trade_no + * @description 查询详情 + * @param int $id * @return \think\Response */ public function detail(int $id){ @@ -41,6 +48,7 @@ class Pay extends BaseAdminController /** * 支付审核通过 + * @description 支付审核通过 * @param string $out_trade_no * @return \think\Response */ @@ -50,6 +58,7 @@ class Pay extends BaseAdminController /** * 审核拒绝 + * @description 审核拒绝 * @param string $out_trade_no */ public function refuse(string $out_trade_no){ @@ -59,11 +68,11 @@ class Pay extends BaseAdminController /** * 去支付 + * @description 去支付 * @return \think\Response */ public function pay() { - $data = $this->request->params([ ['type', ''], ['trade_type', ''],//业务类型 @@ -80,6 +89,7 @@ class Pay extends BaseAdminController /** * 支付信息 + * @description 支付信息 * @param $trade_type * @param $trade_id * @return \think\Response @@ -91,6 +101,7 @@ class Pay extends BaseAdminController /** * 找朋友帮忙付支付信息 + * @description 找朋友帮忙付支付信息 * @param $trade_type * @param $trade_id * @param $channel @@ -103,6 +114,7 @@ class Pay extends BaseAdminController /** * 支付方式列表 + * @description 支付方式列表 * @return \think\Response */ public function payTypeList() diff --git a/niucloud/app/adminapi/controller/pay/PayChannel.php b/niucloud/app/adminapi/controller/pay/PayChannel.php index 712157291..dca345123 100644 --- a/niucloud/app/adminapi/controller/pay/PayChannel.php +++ b/niucloud/app/adminapi/controller/pay/PayChannel.php @@ -19,11 +19,18 @@ use think\db\exception\DbException; use think\db\exception\ModelNotFoundException; use think\Response; +/** + * 支付渠道设置 + * Class PayChannel + * @description 支付渠道设置 + * @package app\adminapi\controller\pay + */ class PayChannel extends BaseAdminController { /** * 支付渠道设置 + * @description 支付渠道设置 * @return Response */ public function set($channel, $type) @@ -39,9 +46,9 @@ class PayChannel extends BaseAdminController return success('SET_SUCCESS'); } - /** * 支付渠道列表 + * @description 支付渠道列表 * @return Response */ public function lists() @@ -51,6 +58,7 @@ class PayChannel extends BaseAdminController /** * 通过渠道获取支付配置 + * @description 通过渠道获取支付配置 * @param $channel * @return Response * @throws DataNotFoundException @@ -64,6 +72,7 @@ class PayChannel extends BaseAdminController /** * 支付设置 + * @description 支付设置 * @return Response */ public function setTransfer() @@ -80,6 +89,7 @@ class PayChannel extends BaseAdminController /** * 多渠道支付设置 + * @description 多渠道支付设置 * @return Response */ public function setAll() @@ -95,6 +105,7 @@ class PayChannel extends BaseAdminController /** * 获取全部支付方式 + * @description 获取全部支付方式 * @return Response */ public function getPayTypeList() { diff --git a/niucloud/app/adminapi/controller/pay/PayRefund.php b/niucloud/app/adminapi/controller/pay/PayRefund.php index e7fa2367c..fcf79f771 100644 --- a/niucloud/app/adminapi/controller/pay/PayRefund.php +++ b/niucloud/app/adminapi/controller/pay/PayRefund.php @@ -15,9 +15,17 @@ use app\dict\pay\RefundDict; use app\service\admin\pay\RefundService; use core\base\BaseAdminController; +/** + * 退款管理 + * Class PayRefund + * @description 退款管理 + * @package app\adminapi\controller\pay + */ class PayRefund extends BaseAdminController { /** + * 退款状态 + * @description 退款状态 * @return \think\Response */ public function getStatus() @@ -26,6 +34,7 @@ class PayRefund extends BaseAdminController } /** * 退款列表 + * @description 退款列表 * @return \think\Response */ public function pages() @@ -40,6 +49,7 @@ class PayRefund extends BaseAdminController /** * 退款详情 + * @description 退款详情 * @param $refund_no * @return \think\Response */ @@ -50,6 +60,7 @@ class PayRefund extends BaseAdminController /** * 获取退款方式 + * @description 获取退款方式 */ public function getRefundType() { @@ -58,6 +69,7 @@ class PayRefund extends BaseAdminController /** * 转账 + * @description 转账 * @return \think\Response */ public function transfer() diff --git a/niucloud/app/adminapi/controller/pay/Transfer.php b/niucloud/app/adminapi/controller/pay/Transfer.php index 3d25ec904..b895cdbb8 100644 --- a/niucloud/app/adminapi/controller/pay/Transfer.php +++ b/niucloud/app/adminapi/controller/pay/Transfer.php @@ -11,15 +11,20 @@ namespace app\adminapi\controller\pay; -use app\dict\pay\TransferDict; -use app\service\admin\pay\PayService; use app\service\admin\pay\TransferService; use core\base\BaseAdminController; +/** + * 转账管理 + * Class Transfer + * @description 转账管理 + * @package app\adminapi\controller\pay + */ class Transfer extends BaseAdminController { /** * 转账方式 + * @description 转账方式 * @return \think\Response */ public function getWechatTransferScene(){ @@ -28,6 +33,7 @@ class Transfer extends BaseAdminController /** * 设置场景id + * @description 设置场景id * @param $scene * @return void */ @@ -40,6 +46,7 @@ class Transfer extends BaseAdminController /** * 设置业务转账场景配置 + * @description 设置业务转账场景配置 * @param $type * @return \think\Response */ diff --git a/niucloud/app/adminapi/controller/poster/Poster.php b/niucloud/app/adminapi/controller/poster/Poster.php index f10612022..2c1ae0bfb 100644 --- a/niucloud/app/adminapi/controller/poster/Poster.php +++ b/niucloud/app/adminapi/controller/poster/Poster.php @@ -15,12 +15,15 @@ use core\base\BaseAdminController; /** * 海报 + * @description 海报 + * @package app\adminapi\controller\poster */ class Poster extends BaseAdminController { /** * 获取海报 + * @description 获取海报 * @return \think\Response */ public function poster() diff --git a/niucloud/app/adminapi/controller/site/Site.php b/niucloud/app/adminapi/controller/site/Site.php index 9980c5fdb..2b12d350f 100644 --- a/niucloud/app/adminapi/controller/site/Site.php +++ b/niucloud/app/adminapi/controller/site/Site.php @@ -17,10 +17,17 @@ use app\service\admin\site\SiteService; use core\base\BaseAdminController; use think\Response; +/** + * 站点管理 + * Class Site + * @description 站点管理 + * @package app\adminapi\controller\site + */ class Site extends BaseAdminController { /** * 站点列表 + * @description 站点列表 * @return Response */ public function lists() @@ -39,6 +46,7 @@ class Site extends BaseAdminController /** * 站点详情 + * @description 站点详情 * @param int $id * @return Response */ @@ -49,6 +57,7 @@ class Site extends BaseAdminController /** * 添加站点 + * @description 添加站点 * ['site_name' => '', 'username' => '', 'head_img' => '', 'real_name' => '', 'password' => '', 'expire_time' => 0] * @return Response */ @@ -72,6 +81,7 @@ class Site extends BaseAdminController /** * 站点状态 + * @description 站点状态 * @return Response */ public function getStatuList() @@ -81,6 +91,7 @@ class Site extends BaseAdminController /** * 站点菜单 + * @description 站点菜单 * @return Response */ public function menu() @@ -90,6 +101,7 @@ class Site extends BaseAdminController /** * 关闭站点 + * @description 关闭站点 */ public function closeSite($id) { @@ -102,6 +114,7 @@ class Site extends BaseAdminController /** * 菜单或接口更新 + * @description 菜单或接口更新 */ public function edit($id) { @@ -122,6 +135,7 @@ class Site extends BaseAdminController /** * 删除站点 + * @description 删除站点 * @param $id * @return Response */ @@ -133,6 +147,7 @@ class Site extends BaseAdminController /** * 开启站点 + * @description 开启站点 */ public function openSite($id) { @@ -150,6 +165,7 @@ class Site extends BaseAdminController /** * 获取站点拥有的应用 + * @description 获取站点拥有的应用 * @return Response */ public function addons() @@ -166,5 +182,23 @@ class Site extends BaseAdminController return success(( new SiteService() )->getShowAppTools()); } + public function showMarketing() + { + return success(( new SiteService() )->getShowMarketingTools()); + } + + /** + * 站点初始化 + * @description 站点初始化 + * @return Response + */ + public function siteInit() + { + $data = $this->request->params([ + [ 'site_id', '' ], + ]); + return success('SUCCESS', ( new SiteService() )->siteInit($data)); + } + } diff --git a/niucloud/app/adminapi/controller/site/SiteAccount.php b/niucloud/app/adminapi/controller/site/SiteAccount.php index 6a98f9b5d..0449f3322 100644 --- a/niucloud/app/adminapi/controller/site/SiteAccount.php +++ b/niucloud/app/adminapi/controller/site/SiteAccount.php @@ -16,10 +16,17 @@ use app\service\admin\site\SiteAccountLogService; use core\base\BaseAdminController; use think\Response; +/** + * 站点账户 + * Class SiteAccount + * @description 站点账户 + * @package app\adminapi\controller\site + */ class SiteAccount extends BaseAdminController { /** * 账单列表 + * @description 账单列表 * @return Response */ public function lists() @@ -34,6 +41,7 @@ class SiteAccount extends BaseAdminController /** * 账单详情 + * @description 账单详情 * @param int $id * @return Response */ @@ -44,12 +52,18 @@ class SiteAccount extends BaseAdminController /** * 累计账单 + * @description 累计账单 */ public function stat() { return success((new SiteAccountLogService())->stat()); } + /** + * 账单类型 + * @description 账单类型 + * @return Response + */ public function accountType() { return success(SiteAccountLogDict::getType()); diff --git a/niucloud/app/adminapi/controller/site/SiteGroup.php b/niucloud/app/adminapi/controller/site/SiteGroup.php index 663ddfef3..e661e94d3 100644 --- a/niucloud/app/adminapi/controller/site/SiteGroup.php +++ b/niucloud/app/adminapi/controller/site/SiteGroup.php @@ -19,12 +19,14 @@ use think\Response; /** * 站点分组 * Class SiteGroup + * @description 站点分组 * @package app\adminapi\controller\site */ class SiteGroup extends BaseAdminController { /** - * 站点列表 + * 站点分组列表 + * @description 站点分组列表 * @return Response */ public function lists() @@ -37,6 +39,7 @@ class SiteGroup extends BaseAdminController /** * 分组详情 + * @description 分组详情 * @param int $group_id * @return Response */ @@ -47,6 +50,7 @@ class SiteGroup extends BaseAdminController /** * 添加分组 + * @description 添加分组 * @return Response * @throws Exception */ @@ -65,6 +69,7 @@ class SiteGroup extends BaseAdminController /** * 编辑分组 + * @description 编辑分组 * @param $group_id * @return Response */ @@ -82,6 +87,7 @@ class SiteGroup extends BaseAdminController /** * 删除分组 + * @description 删除分组 * @param $group_id * @return Response */ @@ -93,6 +99,7 @@ class SiteGroup extends BaseAdminController /** * 所有分组 + * @description 所有分组 * @return Response */ public function all() @@ -105,6 +112,7 @@ class SiteGroup extends BaseAdminController /** * 所有分组 + * @description 所有分组 * @return Response */ public function getUserSiteGroupAll() diff --git a/niucloud/app/adminapi/controller/site/User.php b/niucloud/app/adminapi/controller/site/User.php index e117a55bb..3b877f7e8 100644 --- a/niucloud/app/adminapi/controller/site/User.php +++ b/niucloud/app/adminapi/controller/site/User.php @@ -21,10 +21,16 @@ use think\Response; /** * 站点用户接口 * Class User + * @description 站点用户 * @package app\adminapi\controller\site */ class User extends BaseAdminController { + /** + * 用户列表 + * @description 用户列表 + * @return Response + */ public function lists() { $data = $this->request->params([ @@ -36,6 +42,7 @@ class User extends BaseAdminController /** * 用户详情 + * @description 用户详情 * @param $uid * @return Response */ @@ -46,6 +53,7 @@ class User extends BaseAdminController /** * 新增用户 + * @description 新增用户 * @return Response * @throws Exception */ @@ -67,6 +75,7 @@ class User extends BaseAdminController /** * 更新用户 + * @description 更新用户 */ public function edit($uid) { @@ -83,6 +92,7 @@ class User extends BaseAdminController /** * 更新字段 + * @description 更新字段 * @param $uid * @param $field * @return Response @@ -101,6 +111,7 @@ class User extends BaseAdminController /** * 删除单个用户 + * @description 删除单个用户 * @param $uid * @return Response */ @@ -112,6 +123,7 @@ class User extends BaseAdminController /** * 锁定用户 + * @description 锁定用户 */ public function lock($uid) { @@ -121,10 +133,10 @@ class User extends BaseAdminController /** * 解锁用户 + * @description 解锁用户 */ public function unlock($uid) { - (new SiteUserService())->unlock($uid); return success('MODIFY_SUCCESS'); } diff --git a/niucloud/app/adminapi/controller/site/UserLog.php b/niucloud/app/adminapi/controller/site/UserLog.php index 9ee64bd3b..d1e5643a0 100644 --- a/niucloud/app/adminapi/controller/site/UserLog.php +++ b/niucloud/app/adminapi/controller/site/UserLog.php @@ -15,10 +15,17 @@ use app\service\admin\site\UserLogService; use core\base\BaseAdminController; use think\Response; +/** + * 用户操作日志 + * Class UserLog + * @description 用户操作日志 + * @package app\adminapi\controller\site + */ class UserLog extends BaseAdminController { /** * 操作日志列表 + * @description 操作日志列表 * @return Response */ public function lists() @@ -39,6 +46,7 @@ class UserLog extends BaseAdminController /** * 操作日志详情 + * @description 操作日志详情 * @param $id * @return Response */ @@ -49,6 +57,7 @@ class UserLog extends BaseAdminController /** * 清空日志 + * @description 清空日志 * @return Response */ public function destroy() @@ -57,5 +66,4 @@ class UserLog extends BaseAdminController return success("SUCCESS"); } - } diff --git a/niucloud/app/adminapi/controller/stat/SiteStat.php b/niucloud/app/adminapi/controller/stat/SiteStat.php index 485aee987..c356fad4e 100644 --- a/niucloud/app/adminapi/controller/stat/SiteStat.php +++ b/niucloud/app/adminapi/controller/stat/SiteStat.php @@ -18,12 +18,14 @@ use think\Response; /** * 统计数据 * Class Stat + * @description 统计数据 * @package app\adminapi\controller\stat */ class SiteStat extends BaseAdminController { /** * 首页数据 + * @description 首页数据 * @return Response */ public function index() diff --git a/niucloud/app/adminapi/controller/stat/Stat.php b/niucloud/app/adminapi/controller/stat/Stat.php index 4c251fbd0..38d9941bc 100644 --- a/niucloud/app/adminapi/controller/stat/Stat.php +++ b/niucloud/app/adminapi/controller/stat/Stat.php @@ -18,12 +18,14 @@ use think\Response; /** * 统计数据 * Class Stat + * @description 统计数据 * @package app\adminapi\controller\stat */ class Stat extends BaseAdminController { /** * 首页数据 + * @description 首页数据 * @return Response * @throws \think\db\exception\DataNotFoundException * @throws \think\db\exception\DbException diff --git a/niucloud/app/adminapi/controller/sys/Agreement.php b/niucloud/app/adminapi/controller/sys/Agreement.php index 154fb415d..c2fd62a00 100644 --- a/niucloud/app/adminapi/controller/sys/Agreement.php +++ b/niucloud/app/adminapi/controller/sys/Agreement.php @@ -24,6 +24,7 @@ class Agreement extends BaseAdminController { /** * 协议列表 + * @description 协议列表 * @return Response */ public function lists() @@ -34,6 +35,7 @@ class Agreement extends BaseAdminController /** * 协议内容 + * @description 协议内容 * @param string $key * @return Response */ @@ -45,6 +47,7 @@ class Agreement extends BaseAdminController /** * 协议更新 + * @description 协议更新 * @param string $key * @return Response */ diff --git a/niucloud/app/adminapi/controller/sys/App.php b/niucloud/app/adminapi/controller/sys/App.php index ffefd8269..263b4ef75 100644 --- a/niucloud/app/adminapi/controller/sys/App.php +++ b/niucloud/app/adminapi/controller/sys/App.php @@ -22,6 +22,7 @@ class App extends BaseAdminController { /** * 获取应用链接列表 + * @description 获取应用链接列表 * @return Response */ public function getAppList() diff --git a/niucloud/app/adminapi/controller/sys/Area.php b/niucloud/app/adminapi/controller/sys/Area.php index 0f055e14e..9a06bc740 100644 --- a/niucloud/app/adminapi/controller/sys/Area.php +++ b/niucloud/app/adminapi/controller/sys/Area.php @@ -15,10 +15,17 @@ use app\service\admin\sys\AreaService; use core\base\BaseAdminController; use think\Response; +/** + * 地区管理 + * Class Area + * @description 地区管理 + * @package app\adminapi\controller\sys + */ class Area extends BaseAdminController { /** - * 拖过pid获取子项列表 + * 根据pid获取子项列表 + * @description 根据pid获取子项列表 * @param int $pid * @return Response */ @@ -29,6 +36,7 @@ class Area extends BaseAdminController /** * 获取层级列表 + * @description 获取层级列表 * @param int $level * @return Response */ @@ -38,6 +46,8 @@ class Area extends BaseAdminController } /** + * 获取地址信息 + * @description 获取地址信息 * @return Response */ public function addressInfo() @@ -49,6 +59,8 @@ class Area extends BaseAdminController } /** + * 获取地址信息 + * @description 获取地址信息 * @return Response */ public function contraryAddress() @@ -60,7 +72,8 @@ class Area extends BaseAdminController } /** - * + * 根据code获取地址信息 + * @description 根据code获取地址信息 * @return void */ public function areaByAreaCode(string $code) { diff --git a/niucloud/app/adminapi/controller/sys/Attachment.php b/niucloud/app/adminapi/controller/sys/Attachment.php index fd4b5494b..b9c6227bb 100644 --- a/niucloud/app/adminapi/controller/sys/Attachment.php +++ b/niucloud/app/adminapi/controller/sys/Attachment.php @@ -16,11 +16,18 @@ use app\service\admin\sys\AttachmentService; use core\base\BaseAdminController; use think\Response; +/** + * 附件管理 + * Class Attachment + * @description 附件管理 + * @package app\adminapi\controller\sys + */ class Attachment extends BaseAdminController { /** * 附件列表 + * @description 附件列表 */ public function lists() { @@ -36,6 +43,7 @@ class Attachment extends BaseAdminController /** * 删除附件 + * @description 删除附件 * @param $att_id * @return Response */ @@ -46,6 +54,7 @@ class Attachment extends BaseAdminController /** * 批量删除 + * @description 批量删除 * @return Response */ public function batchDel() @@ -59,6 +68,7 @@ class Attachment extends BaseAdminController /** * 新增附件分组 + * @description 新增附件分组 * @return Response */ public function addCategory() @@ -74,6 +84,7 @@ class Attachment extends BaseAdminController /** * 附件分组列表 + * @description 附件分组列表 */ public function categoryLists() { @@ -86,6 +97,7 @@ class Attachment extends BaseAdminController /** * 更新附件分组 + * @description 更新附件分组 * @return Response */ public function editCategory($id) @@ -100,6 +112,7 @@ class Attachment extends BaseAdminController /** * 删除附件组 + * @description 删除附件组 * @param $id * @return Response */ @@ -111,6 +124,7 @@ class Attachment extends BaseAdminController /** * 移动图片分组 + * @description 移动图片分组 * @return Response */ public function moveCategory($att_id) @@ -124,6 +138,7 @@ class Attachment extends BaseAdminController /** * 批量移动图片分组 + * @description 批量移动图片分组 * @return Response */ public function batchMoveCategory() @@ -136,29 +151,4 @@ class Attachment extends BaseAdminController return success(); } - /** - * 获取图标库分类列表 - */ - public function getIconCategoryList() - { - $data = $this->request->params([ - ['name', ''], - ]); - return success((new AttachmentService())->getIconCategoryList($data)); - } - - /** - * 获取图标库列表 - */ - public function getIconList() - { - $data = $this->request->params([ - ['page', 0], - ['limit', 0], - ['cate_id', 0], - ['real_name', ''], - ]); - return success((new AttachmentService())->getIconList($data)); - } - } diff --git a/niucloud/app/adminapi/controller/sys/Channel.php b/niucloud/app/adminapi/controller/sys/Channel.php index f67cc8122..328a2d9e0 100644 --- a/niucloud/app/adminapi/controller/sys/Channel.php +++ b/niucloud/app/adminapi/controller/sys/Channel.php @@ -15,11 +15,17 @@ use app\dict\common\ChannelDict; use core\base\BaseAdminController; use think\Response; +/** + * 渠道管理 + * Class Channel + * @description 渠道管理 + */ class Channel extends BaseAdminController { /** * 获取渠道列表 + * @description 获取渠道列表 * @return Response */ public function getChannelType() diff --git a/niucloud/app/adminapi/controller/sys/Common.php b/niucloud/app/adminapi/controller/sys/Common.php index 2fb4ec6ca..efed35f2d 100644 --- a/niucloud/app/adminapi/controller/sys/Common.php +++ b/niucloud/app/adminapi/controller/sys/Common.php @@ -17,11 +17,15 @@ use think\Response; /** * 公共数据字典 + * Class Common + * @description 公共数据字典 + * @package app\adminapi\controller\sys */ class Common extends BaseAdminController { /** * 月份 + * @description 月份 * @return Response */ public function getMonth() @@ -31,6 +35,7 @@ class Common extends BaseAdminController /** * 星期 + * @description 星期 * @return Response */ public function getWeek() diff --git a/niucloud/app/adminapi/controller/sys/Config.php b/niucloud/app/adminapi/controller/sys/Config.php index a12ef8428..2f6f707c4 100644 --- a/niucloud/app/adminapi/controller/sys/Config.php +++ b/niucloud/app/adminapi/controller/sys/Config.php @@ -15,10 +15,17 @@ use app\service\admin\sys\ConfigService; use core\base\BaseAdminController; use think\Response; +/** + * 配置管理 + * Class Config + * @description 配置管理 + * @package app\adminapi\controller\sys + */ class Config extends BaseAdminController { /** * 获取网站设置 + * @description 获取网站设置 * @return Response */ public function getWebsite() @@ -28,6 +35,7 @@ class Config extends BaseAdminController /** * 网站设置 + * @description 网站设置 * @return Response */ public function setWebsite() @@ -68,6 +76,7 @@ class Config extends BaseAdminController /** * 获取版权信息 + * @description 获取版权信息 * @return Response */ public function getCopyright() @@ -75,7 +84,9 @@ class Config extends BaseAdminController return success(( new ConfigService() )->getCopyright()); } - /**设置版权信息 + /** + * 设置版权信息 + * @description 设置版权信息 * @return Response */ public function setCopyright() @@ -96,6 +107,7 @@ class Config extends BaseAdminController /** * 场景域名 + * @description 场景域名 * @return Response */ public function getSceneDomain() @@ -105,6 +117,7 @@ class Config extends BaseAdminController /** * 获取服务信息 + * @description 获取服务信息 * @return Response */ public function getServiceInfo() @@ -112,7 +125,9 @@ class Config extends BaseAdminController return success(( new ConfigService() )->getService()); } - /**设置版权信息 + /** + * 设置地图信息 + * @description 设置地图信息 * @return Response */ public function setMap() @@ -128,6 +143,7 @@ class Config extends BaseAdminController /** * 获取地图设置 + * @description 获取地图设置 * @return Response */ public function getMap() @@ -137,6 +153,7 @@ class Config extends BaseAdminController /** * 获取开发者key + * @description 获取开发者key * @return Response */ public function getDeveloperToken() @@ -146,6 +163,7 @@ class Config extends BaseAdminController /** * 设置开发者key + * @description 设置开发者key * @return Response */ public function setDeveloperToken() @@ -159,6 +177,7 @@ class Config extends BaseAdminController /** * 设置布局设置 + * @description 设置布局设置 * @return Response */ public function setLayout() @@ -173,6 +192,7 @@ class Config extends BaseAdminController /** * 获取布局设置 + * @description 获取布局设置 * @return Response */ public function getLayout() @@ -181,7 +201,8 @@ class Config extends BaseAdminController } /** - * 设置布局设置 + * 设置色调设置 + * @description 设置色调设置 * @return Response */ public function setThemeColor() @@ -195,7 +216,8 @@ class Config extends BaseAdminController } /** - * 获取布局设置 + * 获取色调设置 + * @description 获取色调设置 * @return Response */ public function getThemeColor() diff --git a/niucloud/app/adminapi/controller/sys/Export.php b/niucloud/app/adminapi/controller/sys/Export.php index 293b24a8f..c99bbbbc3 100644 --- a/niucloud/app/adminapi/controller/sys/Export.php +++ b/niucloud/app/adminapi/controller/sys/Export.php @@ -16,11 +16,18 @@ use app\service\admin\sys\ExportService; use core\base\BaseAdminController; use think\Response; +/** + * 报表导出 + * Class Export + * @description 报表导出 + * @package app\adminapi\controller\sys + */ class Export extends BaseAdminController { /** * 报表导出列表 + * @description 报表导出列表 * @return Response */ public function lists() @@ -36,6 +43,7 @@ class Export extends BaseAdminController /** * 报表导出 + * @description 报表导出 * @param string $type * @return Response */ @@ -46,6 +54,7 @@ class Export extends BaseAdminController /** * 检查导出数据源是否为空 + * @description 检查导出数据源是否为空 * @param string $type * @return Response */ @@ -57,6 +66,7 @@ class Export extends BaseAdminController /** * 报表删除 + * @description 报表删除 * @param $id * @return Response */ @@ -68,6 +78,7 @@ class Export extends BaseAdminController /** * 获取导出状态列表 + * @description 获取导出状态列表 * @param string $type */ public function getExportStatus() @@ -77,6 +88,7 @@ class Export extends BaseAdminController /** * 获取导出数据类型列表 + * @description 获取导出数据类型列表 * @return Response */ public function getExportDataType(){ diff --git a/niucloud/app/adminapi/controller/sys/Menu.php b/niucloud/app/adminapi/controller/sys/Menu.php index 5bb9e3307..f6d84a264 100644 --- a/niucloud/app/adminapi/controller/sys/Menu.php +++ b/niucloud/app/adminapi/controller/sys/Menu.php @@ -19,11 +19,18 @@ use app\service\admin\sys\MenuService; use core\base\BaseAdminController; use think\Response; +/** + * 菜单管理 + * Class Menu + * @description 菜单管理 + * @package app\adminapi\controller\sys + */ class Menu extends BaseAdminController { /** * 菜单列表(todo 限制只有平台端可以访问) + * @description 菜单列表 * @return Response */ public function lists($app_type) @@ -33,6 +40,7 @@ class Menu extends BaseAdminController /** * 菜单信息 + * @description 菜单信息 * @param $menu_key * @return Response */ @@ -43,6 +51,7 @@ class Menu extends BaseAdminController /** * 新增菜单接口 + * @description 新增菜单 * @return Response */ public function add() @@ -71,6 +80,7 @@ class Menu extends BaseAdminController /** * 菜单或接口更新 + * @description 菜单或接口更新 */ public function edit($app_type, $menu_key) { @@ -94,9 +104,9 @@ class Menu extends BaseAdminController return success('EDIT_SUCCESS'); } - /** * 获取菜单类型静态资源 + * @description 获取菜单类型静态资源 * @return Response */ public function getMenuType() @@ -106,6 +116,7 @@ class Menu extends BaseAdminController /** * 获取请求方式 + * @description 获取请求方式 * @return Response */ public function getMethodType() @@ -115,6 +126,7 @@ class Menu extends BaseAdminController /** * 删除菜单 + * @description 删除菜单 * @param $menu_key * @return Response */ @@ -124,6 +136,11 @@ class Menu extends BaseAdminController return success('DELETE_SUCCESS'); } + /** + * 刷新菜单 + * @description 刷新菜单 + * @return Response + */ public function refreshMenu() { ( new InstallSystemService() )->install(); @@ -132,6 +149,7 @@ class Menu extends BaseAdminController /** * 查询菜单信息 + * @description 查询菜单信息 */ public function getSystem() { @@ -140,6 +158,7 @@ class Menu extends BaseAdminController /** * 查询应用权限信息 + * @description 查询应用权限信息 */ public function getAddonMenu($app_key) { @@ -148,6 +167,7 @@ class Menu extends BaseAdminController /** * 查询菜单类型为目录的菜单 + * @description 查询菜单类型为目录的菜单 * @param $addon * @return Response */ diff --git a/niucloud/app/adminapi/controller/sys/Poster.php b/niucloud/app/adminapi/controller/sys/Poster.php index e490bf65c..2e36177a1 100644 --- a/niucloud/app/adminapi/controller/sys/Poster.php +++ b/niucloud/app/adminapi/controller/sys/Poster.php @@ -18,6 +18,7 @@ use core\base\BaseAdminController; /** * 自定义海报 * Class Poster + * @description 自定义海报 * @package app\adminapi\controller\sys */ class Poster extends BaseAdminController @@ -25,6 +26,7 @@ class Poster extends BaseAdminController /** * 获取自定义海报分页列表 + * @description 获取自定义海报分页列表 * @return \think\Response */ public function pages() @@ -38,6 +40,7 @@ class Poster extends BaseAdminController /** * 获取自定义海报分页列表 + * @description 获取自定义海报分页列表 * @return \think\Response */ public function lists() @@ -51,6 +54,7 @@ class Poster extends BaseAdminController /** * 自定义海报详情 + * @description 自定义海报详情 * @param int $id * @return \think\Response */ @@ -61,6 +65,7 @@ class Poster extends BaseAdminController /** * 添加自定义海报 + * @description 添加自定义海报 * @return \think\Response */ public function add() @@ -80,6 +85,7 @@ class Poster extends BaseAdminController /** * 自定义海报编辑 + * @description 自定义海报编辑 * @param int $id 自定义海报id * @return \think\Response */ @@ -100,6 +106,7 @@ class Poster extends BaseAdminController /** * 自定义海报删除 + * @description 自定义海报删除 * @param int $id 自定义海报id * @return \think\Response */ @@ -111,6 +118,7 @@ class Poster extends BaseAdminController /** * 修改自定义海报状态 + * @description 修改自定义海报状态 * @return \think\Response */ public function modifyStatus() @@ -125,6 +133,7 @@ class Poster extends BaseAdminController /** * 将自定义海报修改为默认海报 + * @description 将自定义海报修改为默认海报 * @return \think\Response */ public function modifyDefault() @@ -138,6 +147,7 @@ class Poster extends BaseAdminController /** * 获取自定义海报类型 + * @description 获取自定义海报类型 * @return \think\Response */ public function type() @@ -150,6 +160,7 @@ class Poster extends BaseAdminController /** * 获取自定义海报模版 + * @description 获取自定义海报模版 * @return \think\Response */ public function template() @@ -163,6 +174,7 @@ class Poster extends BaseAdminController /** * 获取自定义海报初始化数据 + * @description 获取自定义海报初始化数据 * @return \think\Response * @throws \think\db\exception\DbException */ @@ -178,6 +190,7 @@ class Poster extends BaseAdminController /** * 获取自定义海报预览 + * @description 获取自定义海报预览 * @return array|\think\Response */ public function preview() diff --git a/niucloud/app/adminapi/controller/sys/Printer.php b/niucloud/app/adminapi/controller/sys/Printer.php index 878b2c5f6..2ee8f23d8 100644 --- a/niucloud/app/adminapi/controller/sys/Printer.php +++ b/niucloud/app/adminapi/controller/sys/Printer.php @@ -19,6 +19,7 @@ use core\base\BaseAdminController; /** * 小票打印机控制器 * Class Printer + * @description 小票打印机 * @package app\adminapi\controller\sys */ class Printer extends BaseAdminController @@ -26,6 +27,7 @@ class Printer extends BaseAdminController /** * 获取小票打印机分页列表 + * @description 获取小票打印机分页列表 * @return \think\Response */ public function pages() @@ -38,6 +40,7 @@ class Printer extends BaseAdminController /** * 获取小票打印机列表 + * @description 获取小票打印机列表 * @return \think\Response */ public function lists() @@ -50,6 +53,7 @@ class Printer extends BaseAdminController /** * 小票打印机详情 + * @description 小票打印机详情 * @param int $id * @return \think\Response */ @@ -60,6 +64,7 @@ class Printer extends BaseAdminController /** * 添加小票打印机 + * @description 添加小票打印机 * @return \think\Response */ public function add() @@ -84,6 +89,7 @@ class Printer extends BaseAdminController /** * 小票打印机编辑 + * @description 小票打印机编辑 * @param $id 小票打印机id * @return \think\Response */ @@ -109,6 +115,7 @@ class Printer extends BaseAdminController /** * 修改小票打印机状态 + * @description 修改小票打印机状态 * @return \think\Response */ public function modifyStatus() @@ -123,6 +130,7 @@ class Printer extends BaseAdminController /** * 小票打印机删除 + * @description 小票打印机删除 * @param $id 小票打印机id * @return \think\Response */ @@ -134,6 +142,7 @@ class Printer extends BaseAdminController /** * 获取小票打印模板分页列表 + * @description 获取小票打印模板分页列表 * @return \think\Response */ public function templatePageLists() @@ -147,6 +156,7 @@ class Printer extends BaseAdminController /** * 获取小票打印模板列表 + * @description 获取小票打印模板列表 * @return \think\Response * @throws \think\db\exception\DbException */ @@ -161,6 +171,7 @@ class Printer extends BaseAdminController /** * 小票打印模板详情 + * @description 小票打印模板详情 * @param int $id * @return \think\Response */ @@ -171,6 +182,7 @@ class Printer extends BaseAdminController /** * 添加小票打印模板 + * @description 添加小票打印模板 * @return \think\Response */ public function templateAdd() @@ -187,6 +199,7 @@ class Printer extends BaseAdminController /** * 小票打印模板编辑 + * @description 小票打印模板编辑 * @param $id 小票打印模板id * @return \think\Response */ @@ -204,6 +217,7 @@ class Printer extends BaseAdminController /** * 小票打印模板删除 + * @description 小票打印模板删除 * @param $id 小票打印模板id * @return \think\Response */ @@ -215,6 +229,7 @@ class Printer extends BaseAdminController /** * 获取小票打印模板类型 + * @description 获取小票打印模板类型 * @return array|\think\Response */ public function getType() @@ -224,6 +239,7 @@ class Printer extends BaseAdminController /** * 获取小票打印机设备品牌 + * @description 获取小票打印机设备品牌 * @return array|\think\Response */ public function getBrand() @@ -236,6 +252,7 @@ class Printer extends BaseAdminController /** * 测试打印 + * @description 测试打印 * @param int $id * @return \think\Response */ @@ -247,6 +264,7 @@ class Printer extends BaseAdminController /** * 刷新打印机token + * @description 刷新打印机token * @param int $id * @return \think\Response */ @@ -258,6 +276,7 @@ class Printer extends BaseAdminController /** * 打印小票内容 + * @description 打印小票内容 * @return \think\Response */ public function printTicket() diff --git a/niucloud/app/adminapi/controller/sys/Role.php b/niucloud/app/adminapi/controller/sys/Role.php index 5ba76acff..faf0c1900 100644 --- a/niucloud/app/adminapi/controller/sys/Role.php +++ b/niucloud/app/adminapi/controller/sys/Role.php @@ -17,8 +17,19 @@ use core\base\BaseAdminController; use think\db\exception\DbException; use think\Response; +/** + * 用户组管理 + * Class Role + * @description 用户组管理 + * @package app\adminapi\controller\sys + */ class Role extends BaseAdminController { + /** + * 用户组列表 + * @description 用户组列表 + * @return Response + */ public function lists() { $data = $this->request->params([ @@ -31,6 +42,7 @@ class Role extends BaseAdminController /** * 用户组详情 + * @description 用户组详情 * @param $role_id * @return Response */ @@ -41,6 +53,7 @@ class Role extends BaseAdminController /** * 获取全部权限 + * @description 获取全部权限 * @return Response */ public function all() @@ -50,6 +63,7 @@ class Role extends BaseAdminController /** * 新增用户组 + * @description 新增用户组 * @return Response */ public function add() @@ -64,9 +78,9 @@ class Role extends BaseAdminController return success('ADD_SUCCESS'); } - /** * 更新用户组 + * @description 更新用户组 */ public function edit($role_id) { @@ -80,9 +94,24 @@ class Role extends BaseAdminController return success('EDIT_SUCCESS'); } + /** + * 修改状态 + * @description 修改状态 + * @return \think\Response + */ + public function modifyStatus() + { + $data = $this->request->params([ + [ 'role_id', '' ], + [ 'status', '' ], + ]); + ( new RoleService() )->modifyStatus($data); + return success('SUCCESS'); + } /** * 删除单个用户组 + * @description 删除单个用户组 * @param $role_id * @return Response * @throws DbException diff --git a/niucloud/app/adminapi/controller/sys/Schedule.php b/niucloud/app/adminapi/controller/sys/Schedule.php index 747cc424d..c39f54db2 100644 --- a/niucloud/app/adminapi/controller/sys/Schedule.php +++ b/niucloud/app/adminapi/controller/sys/Schedule.php @@ -18,11 +18,14 @@ use think\Response; /** * 自动任务 + * @description 自动任务 + * @package app\adminapi\controller\sys */ class Schedule extends BaseAdminController { /** * 任务列表 + * @description 任务列表 * @return Response */ public function lists() @@ -32,11 +35,11 @@ class Schedule extends BaseAdminController ['status', 'all'], ]); return success(data: (new ScheduleService())->getPage($data)); - } /** * 计划任务模板 + * @description 计划任务模板 * @return Response */ public function template() @@ -46,6 +49,7 @@ class Schedule extends BaseAdminController /** * 获取任务模式 + * @description 获取任务模式 * @return Response */ public function getType() @@ -55,6 +59,7 @@ class Schedule extends BaseAdminController /** * 详情 + * @description 详情 * @param int $id * @return Response */ @@ -65,6 +70,7 @@ class Schedule extends BaseAdminController /** * 添加 + * @description 添加 * @return Response */ public function add() @@ -81,6 +87,7 @@ class Schedule extends BaseAdminController /** * 编辑 + * @description 编辑 * @param int $id * @return Response */ @@ -97,6 +104,7 @@ class Schedule extends BaseAdminController /** * 启用或关闭 + * @description 启用或关闭 * @param int $id * @return Response */ @@ -111,6 +119,7 @@ class Schedule extends BaseAdminController /** * 删除 + * @description 删除 * @param int $id * @return Response */ @@ -122,6 +131,7 @@ class Schedule extends BaseAdminController /** * 时间间隔类型 + * @description 时间间隔类型 * @return Response */ public function getDateType() @@ -131,6 +141,7 @@ class Schedule extends BaseAdminController /** * 执行一次任务 + * @description 执行一次任务 * @param int $id * @return Response */ diff --git a/niucloud/app/adminapi/controller/sys/ScheduleLog.php b/niucloud/app/adminapi/controller/sys/ScheduleLog.php index 7eee9c31b..f8242b481 100644 --- a/niucloud/app/adminapi/controller/sys/ScheduleLog.php +++ b/niucloud/app/adminapi/controller/sys/ScheduleLog.php @@ -17,11 +17,13 @@ use think\Response; /** * 计划任务执行记录 + * @description 计划任务执行记录 */ class ScheduleLog extends BaseAdminController { /** * 任务执行记录列表 + * @description 任务执行记录列表 * @return Response */ public function lists() @@ -38,6 +40,7 @@ class ScheduleLog extends BaseAdminController /** * 删除计划任务执行记录 + * @description 删除计划任务执行记录 * @return Response */ public function del() @@ -51,6 +54,7 @@ class ScheduleLog extends BaseAdminController /** * 清空计划任务执行记录 + * @description 清空计划任务执行记录 * @return Response */ public function clear() diff --git a/niucloud/app/adminapi/controller/sys/System.php b/niucloud/app/adminapi/controller/sys/System.php index 4cd249a46..1981308e7 100644 --- a/niucloud/app/adminapi/controller/sys/System.php +++ b/niucloud/app/adminapi/controller/sys/System.php @@ -18,12 +18,14 @@ use think\Response; /** * 系统信息查询 * Class System + * @description 系统信息查询 * @package app\adminapi\controller\sys */ class System extends BaseAdminController { /** * 获取当前系统信息 + * @description 获取当前系统信息 * @return Response */ public function info() @@ -33,6 +35,7 @@ class System extends BaseAdminController /** * 获取当前url配置 + * @description 获取当前url配置 * @return Response */ public function url() @@ -42,6 +45,7 @@ class System extends BaseAdminController /** * 获取系统环境配置 + * @description 获取系统环境配置 * @return Response */ public function getSystemInfo() @@ -51,6 +55,7 @@ class System extends BaseAdminController /** * 清理表缓存 + * @description 清理表缓存 */ public function schemaCache() { @@ -59,6 +64,7 @@ class System extends BaseAdminController /** * 清理缓存 + * @description 清理缓存 */ public function clearCache() { @@ -67,6 +73,7 @@ class System extends BaseAdminController /** * 校验消息队列是否正常运行 + * @description 校验消息队列是否正常运行 * @return Response */ public function checkJob() @@ -76,6 +83,7 @@ class System extends BaseAdminController /** * 校验计划任务是否正常运行 + * @description 校验计划任务是否正常运行 * @return Response */ public function checkSchedule() @@ -85,6 +93,7 @@ class System extends BaseAdminController /** * 环境变量查询 + * @description 环境变量查询 * @return Response */ public function getEnvInfo() @@ -94,6 +103,7 @@ class System extends BaseAdminController /** * 获取推广二维码 + * @description 获取推广二维码 * @return Response */ public function getSpreadQrcode() diff --git a/niucloud/app/adminapi/controller/sys/Ueditor.php b/niucloud/app/adminapi/controller/sys/Ueditor.php index b00f7953a..68ca3083c 100644 --- a/niucloud/app/adminapi/controller/sys/Ueditor.php +++ b/niucloud/app/adminapi/controller/sys/Ueditor.php @@ -16,6 +16,7 @@ use core\base\BaseAdminController; use think\Response; /** + * Ueditor */ class Ueditor extends BaseAdminController { diff --git a/niucloud/app/adminapi/controller/upload/Storage.php b/niucloud/app/adminapi/controller/upload/Storage.php index 9e38c3cfd..76a8e0782 100644 --- a/niucloud/app/adminapi/controller/upload/Storage.php +++ b/niucloud/app/adminapi/controller/upload/Storage.php @@ -17,11 +17,18 @@ use core\base\BaseAdminController; use core\exception\AdminException; use think\Response; +/** + * 存储管理 + * Class Storage + * @description 存储管理 + * @package app\adminapi\controller\upload + */ class Storage extends BaseAdminController { /** * 云存储配置列表 + * @description 云存储配置列表 */ public function storageList() { @@ -31,6 +38,7 @@ class Storage extends BaseAdminController /** * 存储配置详情 + * @description 存储配置详情 * @param $storage_type 存储驱动类型 * @return Response */ @@ -42,6 +50,7 @@ class Storage extends BaseAdminController /** * 存储设置修改 + * @description 存储设置修改 * @return Response */ public function editStorage($storage_type) diff --git a/niucloud/app/adminapi/controller/upload/Upload.php b/niucloud/app/adminapi/controller/upload/Upload.php index 5eeb118ff..5dcefba6a 100644 --- a/niucloud/app/adminapi/controller/upload/Upload.php +++ b/niucloud/app/adminapi/controller/upload/Upload.php @@ -16,10 +16,17 @@ use app\service\admin\upload\UploadService; use core\base\BaseAdminController; use think\Response; +/** + * 上传管理 + * Class Upload + * @description 上传管理 + * @package app\adminapi\controller\upload + */ class Upload extends BaseAdminController { /** * 图片上传 + * @description 图片上传 * @return Response */ public function image() @@ -36,6 +43,7 @@ class Upload extends BaseAdminController /** * 视频上传 + * @description 视频上传 * @return Response */ public function video() @@ -50,6 +58,7 @@ class Upload extends BaseAdminController /** * 文件上传(默认不上云) + * @description 文件上传 * @return Response */ public function document($type) @@ -63,6 +72,7 @@ class Upload extends BaseAdminController /** * 上传配置 + * @description 上传配置 * @return Response */ public function setUploadConfig() @@ -81,6 +91,7 @@ class Upload extends BaseAdminController /** * 获取上传配置 + * @description 获取上传配置 * @return Response */ public function getUploadConfig() diff --git a/niucloud/app/adminapi/controller/user/User.php b/niucloud/app/adminapi/controller/user/User.php index ebc033ab8..d090ac12e 100644 --- a/niucloud/app/adminapi/controller/user/User.php +++ b/niucloud/app/adminapi/controller/user/User.php @@ -16,8 +16,19 @@ use app\service\admin\user\UserService; use core\base\BaseAdminController; use think\Response; +/** + * 用户管理 + * Class User + * @description 用户管理 + * @package app\adminapi\controller\user + */ class User extends BaseAdminController { + /** + * 用户列表 + * @description 用户列表 + * @return Response + */ public function lists() { $data = $this->request->params([ @@ -32,6 +43,7 @@ class User extends BaseAdminController /** * 用户详情 + * @description 用户详情 * @param $uid * @return Response */ @@ -40,6 +52,11 @@ class User extends BaseAdminController return success((new UserService())->getInfo($uid)); } + /** + * 获取用户列表 + * @description 获取用户列表 + * @return Response + */ public function getUserAll() { $data = $this->request->params([ @@ -51,6 +68,11 @@ class User extends BaseAdminController return success($list); } + /** + * 获取用户下拉框 + * @description 获取用户下拉框 + * @return Response + */ public function getUserSelect() { $data = $this->request->params([ @@ -60,6 +82,12 @@ class User extends BaseAdminController return success($list); } + /** + * 检查用户是否存在 + * @description 检查用户是否存在 + * @return Response + * @throws \think\db\exception\DbException + */ public function checkUserIsExist() { $data = $this->request->params([ ['username', ''], @@ -70,6 +98,7 @@ class User extends BaseAdminController /** * 添加用户 + * @description 添加用户 * @return Response * @throws \Exception */ @@ -88,6 +117,7 @@ class User extends BaseAdminController /** * 编辑用户 + * @description 编辑用户 * @return Response * @throws \Exception */ @@ -103,6 +133,7 @@ class User extends BaseAdminController /** * 删除用户 + * @description 删除用户 * @param $uid * @return Response */ @@ -113,6 +144,7 @@ class User extends BaseAdminController /** * 获取用户站点创建限制 + * @description 获取用户站点创建限制 * @param $uid * @return Response */ @@ -122,7 +154,8 @@ class User extends BaseAdminController /** * 获取用户站点创建限制 - * @param $uid + * @description 获取用户站点创建限制 + * @param $id * @return Response */ public function getUserCreateSiteLimitInfo($id){ @@ -131,6 +164,7 @@ class User extends BaseAdminController /** * 添加用户站点创建限制 + * @description 添加用户站点创建限制 * @param $uid * @return Response */ @@ -147,7 +181,8 @@ class User extends BaseAdminController /** * 编辑用户站点创建限制 - * @param $uid + * @description 编辑用户站点创建限制 + * @param $id * @return Response */ public function editUserCreateSiteLimit($id){ @@ -161,7 +196,8 @@ class User extends BaseAdminController /** * 删除用户站点创建限制 - * @param $uid + * @description 删除用户站点创建限制 + * @param $id * @return Response */ public function delUserCreateSiteLimit($id){ diff --git a/niucloud/app/adminapi/controller/verify/Verifier.php b/niucloud/app/adminapi/controller/verify/Verifier.php index 07dc84cab..089d896f8 100644 --- a/niucloud/app/adminapi/controller/verify/Verifier.php +++ b/niucloud/app/adminapi/controller/verify/Verifier.php @@ -16,10 +16,17 @@ use app\service\admin\verify\VerifierService; use core\base\BaseAdminController; use think\Response; +/** + * 核销人员 + * Class Verifier + * @description 核销人员 + * @package app\adminapi\controller\verify + */ class Verifier extends BaseAdminController { /** * 核销人员列表 + * @description 核销人员列表 * @return Response */ public function lists() @@ -29,6 +36,7 @@ class Verifier extends BaseAdminController /** * 核销人员列表 + * @description 核销人员列表 * @return Response */ public function select() @@ -38,7 +46,8 @@ class Verifier extends BaseAdminController /** * 获取核销员信息 - * @param int $order_id + * @description 获取核销员信息 + * @param int $id * @return Response */ public function detail($id) @@ -48,7 +57,7 @@ class Verifier extends BaseAdminController /** * 添加核销员 - * @param int $order_id + * @description 添加核销员 * @return Response */ public function add() @@ -62,7 +71,8 @@ class Verifier extends BaseAdminController /** * 添加核销员 - * @param int $order_id + * @description 添加核销员 + * @param int $id * @return Response */ public function edit($id) @@ -76,6 +86,7 @@ class Verifier extends BaseAdminController /** * 删除核销员 + * @description 删除核销员 */ public function del(int $id) { @@ -84,6 +95,7 @@ class Verifier extends BaseAdminController /** * 获取核销类型 + * @description 获取核销类型 * @return Response */ public function getVerifyType() diff --git a/niucloud/app/adminapi/controller/verify/Verify.php b/niucloud/app/adminapi/controller/verify/Verify.php index 5e62b2767..f6284b26c 100644 --- a/niucloud/app/adminapi/controller/verify/Verify.php +++ b/niucloud/app/adminapi/controller/verify/Verify.php @@ -15,10 +15,17 @@ use app\service\admin\verify\VerifyService; use core\base\BaseAdminController; use think\Response; +/** + * 核销记录 + * Class Verify + * @description 核销记录 + * @package app\adminapi\controller\verify + */ class Verify extends BaseAdminController { /** * 核销记录列表 + * @description 核销记录列表 * @return Response */ public function lists() @@ -35,6 +42,7 @@ class Verify extends BaseAdminController /** * 核销信息 + * @description 核销信息 * @param int $order_id * @return Response */ diff --git a/niucloud/app/adminapi/controller/weapp/Config.php b/niucloud/app/adminapi/controller/weapp/Config.php index 16aa77b71..ca6ceaca8 100644 --- a/niucloud/app/adminapi/controller/weapp/Config.php +++ b/niucloud/app/adminapi/controller/weapp/Config.php @@ -15,10 +15,17 @@ use app\service\admin\weapp\WeappConfigService; use core\base\BaseAdminController; use think\Response; +/** + * 微信小程序配置 + * Class Config + * @description 微信小程序配置 + * @package app\adminapi\controller\weapp + */ class Config extends BaseAdminController { /** * 获取微信小程序配置信息 + * @description 获取微信小程序配置信息 * @return Response */ public function get() @@ -28,6 +35,7 @@ class Config extends BaseAdminController /** * 设置微信小程序配置信息 + * @description 设置微信小程序配置信息 * @return Response */ public function set() @@ -50,6 +58,7 @@ class Config extends BaseAdminController /** * 设置微信小程序域名 + * @description 设置微信小程序域名 * @return Response */ public function setDomain() { @@ -67,6 +76,7 @@ class Config extends BaseAdminController /** * 获取微信小程序隐私协议 + * @description 获取微信小程序隐私协议 * @return Response */ public function getPrivacySetting() { @@ -75,6 +85,7 @@ class Config extends BaseAdminController /** * 设置微信小程序隐私协议 + * @description 设置微信小程序隐私协议 * @return Response */ public function setPrivacySetting() { diff --git a/niucloud/app/adminapi/controller/weapp/Delivery.php b/niucloud/app/adminapi/controller/weapp/Delivery.php index 2c2a3b996..3a10c871a 100644 --- a/niucloud/app/adminapi/controller/weapp/Delivery.php +++ b/niucloud/app/adminapi/controller/weapp/Delivery.php @@ -16,12 +16,14 @@ use core\base\BaseAdminController; /** * 小程序发货信息管理服务 + * @description 小程序发货信息管理服务 */ class Delivery extends BaseAdminController { /** * 查询小程序是否已开通发货信息管理服务 + * @description 查询小程序是否已开通发货信息管理服务 * @return bool * @throws \EasyWeChat\Kernel\Exceptions\InvalidArgumentException */ diff --git a/niucloud/app/adminapi/controller/weapp/Template.php b/niucloud/app/adminapi/controller/weapp/Template.php index fb52d7818..b3686fbff 100644 --- a/niucloud/app/adminapi/controller/weapp/Template.php +++ b/niucloud/app/adminapi/controller/weapp/Template.php @@ -17,12 +17,14 @@ use think\Response; /** * 微信小程序订阅消息 + * @description 微信小程序订阅消息 */ class Template extends BaseAdminController { /** * 订阅消息 + * @description 订阅消息 * @return Response */ public function lists() @@ -32,7 +34,8 @@ class Template extends BaseAdminController } /** - * 菜单信息 + * 同步微信公众号消息模板 + * @description 同步微信公众号消息模板 * @return Response */ public function sync() diff --git a/niucloud/app/adminapi/controller/weapp/Version.php b/niucloud/app/adminapi/controller/weapp/Version.php index e64af8988..4475ddac9 100644 --- a/niucloud/app/adminapi/controller/weapp/Version.php +++ b/niucloud/app/adminapi/controller/weapp/Version.php @@ -17,11 +17,13 @@ use think\Response; /** * 小程序版本管理控制器 + * @description 小程序版本管理 */ class Version extends BaseAdminController { /** * 列表 + * @description 列表 * @return Response */ public function lists() @@ -34,6 +36,7 @@ class Version extends BaseAdminController /** * 详情 + * @description 详情 * @param int $id * @return Response */ @@ -44,6 +47,7 @@ class Version extends BaseAdminController /** * 添加 + * @description 添加 * @return Response */ public function add() @@ -56,7 +60,7 @@ class Version extends BaseAdminController /** * 获取预览码 - * @param int $id + * @description 获取预览码 * @return Response */ public function preview() @@ -66,6 +70,7 @@ class Version extends BaseAdminController /** * 删除 + * @description 删除 * @param int $id * @return Response */ diff --git a/niucloud/app/adminapi/controller/wechat/Config.php b/niucloud/app/adminapi/controller/wechat/Config.php index b78efa397..949fd4910 100644 --- a/niucloud/app/adminapi/controller/wechat/Config.php +++ b/niucloud/app/adminapi/controller/wechat/Config.php @@ -19,6 +19,7 @@ class Config extends BaseAdminController { /** * 获取微信配置信息 + * @description 获取微信配置信息 * @return Response */ public function get() @@ -28,6 +29,7 @@ class Config extends BaseAdminController /** * 设置微信配置信息 + * @description 设置微信配置信息 * @return Response */ public function set() @@ -49,6 +51,7 @@ class Config extends BaseAdminController /** * 获取微信静态资源 + * @description 获取微信静态资源 * @return Response */ public function static() diff --git a/niucloud/app/adminapi/controller/wechat/Media.php b/niucloud/app/adminapi/controller/wechat/Media.php index 8330f32f7..9593143e5 100644 --- a/niucloud/app/adminapi/controller/wechat/Media.php +++ b/niucloud/app/adminapi/controller/wechat/Media.php @@ -29,6 +29,7 @@ class Media extends BaseAdminController /** * 上传图片素材 + * @description 上传图片素材 * @return \think\Response * @throws \EasyWeChat\Kernel\Exceptions\InvalidArgumentException * @throws \Symfony\Contracts\HttpClient\Exception\TransportExceptionInterface @@ -42,6 +43,7 @@ class Media extends BaseAdminController /** * 上传视频素材 + * @description 上传视频素材 * @return \think\Response * @throws \EasyWeChat\Kernel\Exceptions\InvalidArgumentException * @throws \Symfony\Contracts\HttpClient\Exception\TransportExceptionInterface @@ -55,6 +57,7 @@ class Media extends BaseAdminController /** * 同步草稿箱 + * @description 同步草稿箱 * @return \think\Response * @throws \EasyWeChat\Kernel\Exceptions\InvalidArgumentException * @throws \Symfony\Contracts\HttpClient\Exception\TransportExceptionInterface diff --git a/niucloud/app/adminapi/controller/wechat/Menu.php b/niucloud/app/adminapi/controller/wechat/Menu.php index 7f863d4be..a27a68685 100644 --- a/niucloud/app/adminapi/controller/wechat/Menu.php +++ b/niucloud/app/adminapi/controller/wechat/Menu.php @@ -24,7 +24,8 @@ class Menu extends BaseAdminController { /** - * 菜单信息 + * 获取微信菜单 + * @description 获取微信菜单 * @return Response */ public function info() @@ -34,7 +35,8 @@ class Menu extends BaseAdminController } /** - * 设置菜单 + * 更新微信菜单 + * @description 更新微信菜单 * @return Response * @throws InvalidConfigException * @throws GuzzleException diff --git a/niucloud/app/adminapi/controller/wechat/Reply.php b/niucloud/app/adminapi/controller/wechat/Reply.php index 491ae7145..a78161f92 100644 --- a/niucloud/app/adminapi/controller/wechat/Reply.php +++ b/niucloud/app/adminapi/controller/wechat/Reply.php @@ -23,6 +23,7 @@ class Reply extends BaseAdminController /** * 关键词回复 + * @description 关键词回复 * @return Response */ public function keyword($id) @@ -43,6 +44,7 @@ class Reply extends BaseAdminController /** * 新增关键词回复 + * @description 新增关键词回复 * @return Response */ public function addKeyword() @@ -62,6 +64,7 @@ class Reply extends BaseAdminController /** * 更新关键词回复 + * @description 更新关键词回复 * @return Response */ public function editKeyword($id) @@ -81,6 +84,7 @@ class Reply extends BaseAdminController /** * 删除关键字回复 + * @description 删除关键字回复 * @return Response */ public function delKeyword($id) @@ -92,6 +96,7 @@ class Reply extends BaseAdminController /** * 获取默认回复 + * @description 获取默认回复 * @return Response */ public function default() @@ -102,6 +107,7 @@ class Reply extends BaseAdminController /** * 更新默认回复 + * @description 更新默认回复 * @return Response */ public function editDefault() @@ -116,6 +122,7 @@ class Reply extends BaseAdminController /** * 获取关注回复 + * @description 获取关注回复 * @return Response */ public function subscribe() @@ -126,6 +133,7 @@ class Reply extends BaseAdminController /** * 更新关注回复 + * @description 更新关注回复 * @return Response */ public function editSubscribe() diff --git a/niucloud/app/adminapi/controller/wechat/Template.php b/niucloud/app/adminapi/controller/wechat/Template.php index c8aa42c69..fe9278279 100644 --- a/niucloud/app/adminapi/controller/wechat/Template.php +++ b/niucloud/app/adminapi/controller/wechat/Template.php @@ -22,7 +22,8 @@ class Template extends BaseAdminController { /** - * 菜单信息 + * 同步微信公众号消息模板 + * @description 同步微信公众号消息模板 * @return Response */ public function sync() @@ -36,6 +37,7 @@ class Template extends BaseAdminController /** * 模板消息 + * @description 获取模板消息 * @return Response */ public function lists() diff --git a/niucloud/app/adminapi/controller/wxoplatform/Config.php b/niucloud/app/adminapi/controller/wxoplatform/Config.php index 11d651e6c..b0588895b 100644 --- a/niucloud/app/adminapi/controller/wxoplatform/Config.php +++ b/niucloud/app/adminapi/controller/wxoplatform/Config.php @@ -19,6 +19,7 @@ class Config extends BaseAdminController { /** * 获取微信开放平台开放平台配置信息 + * @description 获取微信开放平台开放平台配置信息 * @return Response */ public function get() @@ -28,6 +29,7 @@ class Config extends BaseAdminController /** * 设置微信开放平台配置信息 + * @description 设置微信开放平台配置信息 * @return Response */ public function set() @@ -46,6 +48,7 @@ class Config extends BaseAdminController /** * 获取微信开放平台静态资源 + * @description 获取微信开放平台静态资源 * @return Response */ public function static() diff --git a/niucloud/app/adminapi/controller/wxoplatform/Oplatform.php b/niucloud/app/adminapi/controller/wxoplatform/Oplatform.php index 2774fedb4..7f7969c1a 100644 --- a/niucloud/app/adminapi/controller/wxoplatform/Oplatform.php +++ b/niucloud/app/adminapi/controller/wxoplatform/Oplatform.php @@ -19,6 +19,7 @@ class Oplatform extends BaseAdminController { /** * 获取授权链接 + * @description 获取授权链接 * @return Response */ public function getAuthorizationUrl() @@ -28,6 +29,7 @@ class Oplatform extends BaseAdminController /** * 授权 + * @description 授权 * @return Response */ public function authorization() { diff --git a/niucloud/app/adminapi/controller/wxoplatform/Server.php b/niucloud/app/adminapi/controller/wxoplatform/Server.php index c687ec43a..125b95475 100644 --- a/niucloud/app/adminapi/controller/wxoplatform/Server.php +++ b/niucloud/app/adminapi/controller/wxoplatform/Server.php @@ -19,6 +19,7 @@ class Server extends BaseAdminController { /** * 微信开放平台授权事件接收 + * @description 微信开放平台授权事件接收 * @return Response */ public function server() @@ -32,6 +33,7 @@ class Server extends BaseAdminController /** * 微信开放平台消息与事件接收 + * @description 微信开放平台消息与事件接收 * @param string $appid * @return Response */ diff --git a/niucloud/app/adminapi/controller/wxoplatform/WeappVersion.php b/niucloud/app/adminapi/controller/wxoplatform/WeappVersion.php index 0aa4870fb..c313c10a5 100644 --- a/niucloud/app/adminapi/controller/wxoplatform/WeappVersion.php +++ b/niucloud/app/adminapi/controller/wxoplatform/WeappVersion.php @@ -19,6 +19,7 @@ class WeappVersion extends BaseAdminController { /** * 平台提交小程序版本 + * @description 平台提交小程序版本 * @return Response */ public function weappCommit() { @@ -30,13 +31,13 @@ class WeappVersion extends BaseAdminController return success(); } - public function getSiteGroupCommitRecord() { return success(data:(new WeappVersionService())->getSiteGroupCommitRecord()); } /** * 获取最后一次提交记录 + * @description 获取最后一次提交记录 * @return Response */ public function lastCommitRecord() { @@ -52,6 +53,7 @@ class WeappVersion extends BaseAdminController /** * 站点小程序提交 + * @description 站点小程序提交 * @return Response */ public function siteWeappCommit() { @@ -59,6 +61,11 @@ class WeappVersion extends BaseAdminController return success(); } + /** + * 撤销审核 + * @description 撤销审核 + * @return Response + */ public function undoAudit() { $data = $this->request->params([ ['id', ""] @@ -69,6 +76,7 @@ class WeappVersion extends BaseAdminController /** * 同步套餐下站点小程序 + * @description 同步套餐下站点小程序 * @return Response */ public function syncSiteWeapp() { diff --git a/niucloud/app/adminapi/middleware/AdminLog.php b/niucloud/app/adminapi/middleware/AdminLog.php index 361b22d2d..17e8d0233 100644 --- a/niucloud/app/adminapi/middleware/AdminLog.php +++ b/niucloud/app/adminapi/middleware/AdminLog.php @@ -15,6 +15,8 @@ namespace app\adminapi\middleware; use app\Request; use app\service\admin\site\UserLogService; use Closure; +use ReflectionClass; +use think\facade\Route; /** * admin用户操作日志 @@ -27,18 +29,63 @@ class AdminLog { //写入日志 if ($request->method() != 'GET') { + $path = $request->rule()->getRoute(); + if(strstr($path,'@')){ + $arr = explode('@', $path); + $controller = $arr[0] ?? ""; + $action = $arr[1] ?? ""; + }else{ + //暂时只有APP目录下使用这样的路由定义 + list($controllerStr, $action) = explode('/', $path, 2); + list($module, $controller) = explode('.', $controllerStr, 2); + // 拼接完整类名（根据 TP 命名空间规则调整） + $controllerClass = "app\\adminapi\\controller\\{$module}\\{$controller}"; + $controller = $controllerClass; + } + + $operation = $this->extractDescFromAnnotation($controller, $action); $data = [ 'uid' => $request->uid(), 'username' => $request->username(), 'url' => $request->url(), 'params' => $request->param(), 'ip' => $request->ip(), - 'type' => $request->method() - + 'type' => $request->method(), + 'operation' => $operation, ]; (new UserLogService())->add($data); } return $next($request); } + + private function extractDescFromAnnotation($controllerClass, $actionMethod) + { + try { + if (!class_exists($controllerClass)) { + return ''; + } + + $reflection = new ReflectionClass($controllerClass); + $controller_comment = $reflection->getDocComment(); + $controller_desc = ''; + if (preg_match('/@description\s+(.+)/', $controller_comment, $matches)) { + $controller_desc = $matches[1]; + } + if (!$reflection->hasMethod($actionMethod)) { + return ''; + } + + $method = $reflection->getMethod($actionMethod); + $docComment = $method->getDocComment(); + + if (preg_match('/@description\s+(.+)/', $docComment, $matches)) { + return (empty($controller_desc) ? "" : $controller_desc.'-').$matches[1]; + } + + return ''; + } catch (\Exception $e) { + return ''; + } + } } diff --git a/niucloud/app/adminapi/route/home.php b/niucloud/app/adminapi/route/home.php index f1bc93e23..23e6b1b3e 100644 --- a/niucloud/app/adminapi/route/home.php +++ b/niucloud/app/adminapi/route/home.php @@ -30,6 +30,8 @@ Route::group('home', function () { Route::put('site/:id', 'home.Site/edit'); // 获取可选择的店铺套餐 Route::get('site/group', 'home.Site/getSiteGroup'); + // 获取可选择的店铺应用列表 + Route::get('site/group/app_list', 'home.Site/getSiteGroupAppList'); // 获取可选择的店铺套餐 Route::post('site/create', 'home.Site/create'); })->middleware(AdminCheckToken::class, true) diff --git a/niucloud/app/adminapi/route/member.php b/niucloud/app/adminapi/route/member.php index 59cfc3508..f37c68203 100644 --- a/niucloud/app/adminapi/route/member.php +++ b/niucloud/app/adminapi/route/member.php @@ -36,6 +36,7 @@ Route::group('member', function() { Route::get('member/export', 'member.Member/export'); Route::put('member/modify/:member_id/:field', 'member.Member/modify'); + Route::post('member/batch_modify', 'member.Member/batchModify'); //会员注册方式 Route::get('registertype', 'member.Member/getMemberRegisterType'); //会员注册渠道 diff --git a/niucloud/app/adminapi/route/notice.php b/niucloud/app/adminapi/route/notice.php index 8471d849b..930a2b432 100644 --- a/niucloud/app/adminapi/route/notice.php +++ b/niucloud/app/adminapi/route/notice.php @@ -85,6 +85,7 @@ Route::group('notice', function () { Route::get('info/:sms_type/:username', 'notice.NiuSms/templateInfo'); Route::get('report/config', 'notice.NiuSms/templateCreateConfig'); Route::post('report/:sms_type/:username', 'notice.NiuSms/templateCreate'); + Route::delete(':username/:template_id', 'notice.NiuSms/templateDelete'); }); }); diff --git a/niucloud/app/adminapi/route/site.php b/niucloud/app/adminapi/route/site.php index 69def6406..8e15d79d1 100644 --- a/niucloud/app/adminapi/route/site.php +++ b/niucloud/app/adminapi/route/site.php @@ -37,6 +37,8 @@ Route::group('site', function () { Route::put('opensite/:id', 'site.Site/openSite'); //站点状态 Route::get('statuslist', 'site.Site/getStatuList'); + //站点初始化 + Route::post('init', 'site.Site/siteInit'); /***************************************************** 站点分组 *************************************************/ //站点分组 Route::get('group', 'site.SiteGroup/lists'); @@ -90,6 +92,8 @@ Route::group('site', function () { Route::get('addons', 'site.Site/addons'); // 获取应用列表 Route::get('showapp', 'site.Site/showApp'); + // 获取营销列表 + Route::get('showMarketing', 'site.Site/showMarketing'); })->middleware([ AdminCheckToken::class, AdminCheckRole::class, diff --git a/niucloud/app/adminapi/route/sys.php b/niucloud/app/adminapi/route/sys.php index fd4956817..9b7f85a74 100644 --- a/niucloud/app/adminapi/route/sys.php +++ b/niucloud/app/adminapi/route/sys.php @@ -33,6 +33,8 @@ Route::group('sys', function() { Route::get('role/:role_id', 'sys.Role/info'); //用户组新增 Route::post('role', 'sys.Role/add'); + //修改角色状态 + Route::put('role/status', 'sys.Role/modifyStatus'); //编辑用户组 Route::put('role/:role_id', 'sys.Role/edit'); //删除用户组 @@ -135,10 +137,6 @@ Route::group('sys', function() { Route::put('upload/config', 'upload.Upload/setUploadConfig'); //获取上传设置 Route::get('upload/config', 'upload.Upload/getUploadConfig'); - // 获取图标库列表 - Route::get('attachment/icon_category', 'sys.Attachment/getIconCategoryList'); - // 获取图标库列表 - Route::get('attachment/icon', 'sys.Attachment/getIconList'); /***************************************************** 协议管理 ****************************************************/ //消息列表 Route::get('agreement', 'sys.Agreement/lists'); diff --git a/niucloud/app/api/controller/diy/DiyForm.php b/niucloud/app/api/controller/diy/DiyForm.php index eb9f08edd..e33f05c20 100644 --- a/niucloud/app/api/controller/diy/DiyForm.php +++ b/niucloud/app/api/controller/diy/DiyForm.php @@ -43,6 +43,20 @@ class DiyForm extends BaseApiController return success('SUCCESS', ( new DiyFormService() )->addRecord($data)); } + /** + * 编辑填表记录 + * @return Response + */ + public function editRecord() + { + $data = $this->request->params([ + [ 'record_id', '' ], + [ 'value', [] ], + [ 'relate_id', '' ], + ]); + return success('SUCCESS', ( new DiyFormService() )->editRecord($data)); + } + /** * 获取表单填写结果信息 * @return Response @@ -66,4 +80,13 @@ class DiyForm extends BaseApiController ]); return success('SUCCESS', ( new DiyFormService() )->getFormRecordInfo($data)); } + + /** + * 获取个人资料表单填写记录 + * @return Response + */ + public function getMemberInfoRecord() + { + return success('SUCCESS', ( new DiyFormService() )->getMemberInfoFormRecordInfo()); + } } diff --git a/niucloud/app/api/route/diy.php b/niucloud/app/api/route/diy.php index b3679dfcb..cf2753194 100644 --- a/niucloud/app/api/route/diy.php +++ b/niucloud/app/api/route/diy.php @@ -42,12 +42,18 @@ Route::group('diy', function() { // 提交填表记录 Route::post('form/record', 'diy.DiyForm/addRecord'); + // 修改填表记录 + Route::put('form/record', 'diy.DiyForm/editRecord'); + // 获取表单填写结果信息 Route::get('form/result', 'diy.DiyForm/getResult'); // 获取填表记录 Route::get('form/record', 'diy.DiyForm/getRecord'); + // 获取个人资料表单填写记录 + Route::get('form/member_record', 'diy.DiyForm/getMemberInfoRecord'); + })->middleware(ApiLog::class) ->middleware(ApiCheckToken::class, true); diff --git a/niucloud/app/api/route/file.php b/niucloud/app/api/route/file.php index 9b5670415..ae4cf5cf6 100644 --- a/niucloud/app/api/route/file.php +++ b/niucloud/app/api/route/file.php @@ -21,12 +21,7 @@ use think\facade\Route; Route::group('file', function() { /***************************************************** 会员管理 ****************************************************/ - //上传图片 - Route::post('image', 'upload.Upload/image'); - //上传视频 - Route::post('video', 'upload.Upload/video'); - //拉取图片 - Route::post('image/fetch', 'upload.Upload/imageFetch'); + })->middleware(ApiChannel::class) ->middleware(ApiCheckToken::class, true) @@ -36,7 +31,12 @@ Route::group('file', function() { * 会员个人信息管理 */ Route::group('file', function() { - + //上传图片 + Route::post('image', 'upload.Upload/image'); + //上传视频 + Route::post('video', 'upload.Upload/video'); + //拉取图片 + Route::post('image/fetch', 'upload.Upload/imageFetch'); //base64图片 Route::post('image/base64', 'upload.Upload/imageBase64'); diff --git a/niucloud/app/command/workerman/Workerman.php b/niucloud/app/command/workerman/Workerman.php index 4cfce6da2..23fd8abcc 100644 --- a/niucloud/app/command/workerman/Workerman.php +++ b/niucloud/app/command/workerman/Workerman.php @@ -182,7 +182,7 @@ class Workerman extends Command $addon_path = $addon_dir . $v[ 'key' ] . DIRECTORY_SEPARATOR . 'app' . DIRECTORY_SEPARATOR . 'job'; if (is_dir($addon_path)) { search_dir($addon_path, $addon_data, root_path()); - $class_list = array_merge($class_list, $addon_data); + $class_list = array_merge($class_list, array_filter($addon_data)); } } diff --git a/niucloud/app/dict/common/CommonActiveDict.php b/niucloud/app/dict/common/CommonActiveDict.php new file mode 100644 index 000000000..ba65f62c6 --- /dev/null +++ b/niucloud/app/dict/common/CommonActiveDict.php @@ -0,0 +1,78 @@ + [ + 'name' => get_lang('common_active_short.impulse_buy_short'), + 'active_name' => get_lang('common_active_short.impulse_buy_name'), + 'bg_color' => "#FF7700" + ], + self::GIFTCARD => [ + 'name' => get_lang('common_active_short.gift_card_short'), + 'active_name' => get_lang('common_active_short.gift_card_name'), + 'bg_color' => '#F00000' + ], + self::DISCOUNT => [ + 'name' => get_lang('common_active_short.discount_short'), + 'active_name' => get_lang('common_active_short.discount_name'), + 'bg_color' => '#FFA322' + ], + self::EXCHANGE => [ + 'name' => get_lang('common_active_short.exchange_short'), + 'active_name' => get_lang('common_active_short.exchange_name'), + 'bg_color' => '#00C441' + ], + self::MANJIANSONG => [ + 'name' => get_lang('common_active_short.manjiansong_short'), + 'active_name' => get_lang('common_active_short.manjiansong_name'), + 'bg_color' => '#249DE9' + ], + self::NEWCOMER_DISCOUNT => [ + 'name' => get_lang('common_active_short.newcomer_discount_short'), + 'active_name' => get_lang('common_active_short.newcomer_discount_name'), + 'bg_color' => '#BB27FF' + ], + self::SECKILL => [ + 'name' => get_lang('common_active_short.seckill_short'), + 'active_name' => get_lang('common_active_short.seckill_name'), + 'bg_color' => '#F606CA' + ], + self::PINTUAN => [ + 'name' => get_lang('common_active_short.pintuan_short'), + 'active_name' => get_lang('common_active_short.pintuan_name'), + 'bg_color' => '#FF1C77' + ], + ]; + return !empty($active) ? $data[$active] : $data; + } +} \ No newline at end of file diff --git a/niucloud/app/dict/diy/PagesDict.php b/niucloud/app/dict/diy/PagesDict.php index e84b7558d..717de8017 100644 --- a/niucloud/app/dict/diy/PagesDict.php +++ b/niucloud/app/dict/diy/PagesDict.php @@ -191,7 +191,7 @@ class PagesDict 'imgUrl' => "", 'imgWidth' => '', 'imgHeight' => '', - 'count' => -1, + 'count' => 'once', 'show' => 0, 'link' => [ 'name' => "" @@ -263,7 +263,7 @@ class PagesDict 'imgUrl' => "", 'imgWidth' => '', 'imgHeight' => '', - 'count' => -1, + 'count' => 'once', 'show' => 0, 'link' => [ 'name' => "" @@ -728,7 +728,7 @@ class PagesDict 'imgUrl' => "", 'imgWidth' => '', 'imgHeight' => '', - 'count' => -1, + 'count' => 'once', 'show' => 0, 'link' => [ 'name' => "" diff --git a/niucloud/app/dict/diy_form/TemplateDict.php b/niucloud/app/dict/diy_form/TemplateDict.php index cc2cdf0ca..310853ce2 100644 --- a/niucloud/app/dict/diy_form/TemplateDict.php +++ b/niucloud/app/dict/diy_form/TemplateDict.php @@ -82,7 +82,7 @@ class TemplateDict "imgUrl" => "", "imgWidth" => "", "imgHeight" => "", - "count" => -1, + "count" => 'once', "show" => 0, "link" => [ "name" => "" @@ -683,6 +683,392 @@ class TemplateDict ], ], + "DIY_FORM_MEMBER_INFO" => [ + 'member_info_form_data' => [ // 页面标识 + "title" => "个人资料", // 页面名称 + 'cover' => '', // 页面封面图 + 'preview' => '', // 页面预览图 + 'desc' => '适用于会员个人资料字段补充收集', // 页面描述 + 'containField' => '共7个字段，包含7个字段：姓名、身份证号、邮箱、职业、爱好、身份证人像面、身份证国徽面', // 包含字段 + // 页面数据源 + "data" => [ + "global" => [ + "title" => "个人资料", + "completeLayout" => "style-1", + "completeAlign" => "left", + "borderControl" => true, + "pageStartBgColor" => "rgba(255, 255, 255, 1)", + "pageEndBgColor" => "", + "pageGradientAngle" => "to bottom", + "bgUrl" => "", + "bgHeightScale" => 100, + "imgWidth" => "", + "imgHeight" => "", + "topStatusBar" => [ + "isShow" => true, + "bgColor" => "#ffffff", + "rollBgColor" => "#ffffff", + "style" => "style-1", + "styleName" => "风格1", + "textColor" => "#333333", + "rollTextColor" => "#333333", + "textAlign" => "center", + "inputPlaceholder" => "请输入搜索关键词", + "imgUrl" => "", + "link" => [ + "name" => "" + ] + ], + "bottomTabBarSwitch" => true, + "popWindow" => [ + "imgUrl" => "", + "imgWidth" => "", + "imgHeight" => "", + "count" => -1, + "show" => 0, + "link" => [ + "name" => "" + ] + ], + "template" => [ + "textColor" => "#303133", + "pageStartBgColor" => "", + "pageEndBgColor" => "", + "pageGradientAngle" => "to bottom", + "componentBgUrl" => "", + "componentBgAlpha" => 2, + "componentStartBgColor" => "", + "componentEndBgColor" => "", + "componentGradientAngle" => "to bottom", + "topRounded" => 0, + "bottomRounded" => 0, + "elementBgColor" => "", + "topElementRounded" => 0, + "bottomElementRounded" => 0, + "margin" => [ + "top" => 0, + "bottom" => 0, + "both" => 0 + ], + "isHidden" => false + ] + ], + "value" => [ + [ + "path" => "edit-form-input", + "uses" => 0, + "position" => "", + "componentType" => "diy_form", + "id" => "46wkksoz5ew0", + "componentName" => "FormInput", + "componentTitle" => "单行文本", + "ignore" => [ + "componentBgUrl" + ], + "field" => [ + "name" => "姓名", + "remark" => [ + "text" => "", + "color" => "#999999", + "fontSize" => 14 + ], + "required" => true, + "unique" => false, + "autofill" => false, + "privacyProtection" => false, + "cache" => true, + "default" => "", + "value" => "" + ], + "placeholder" => "请输入姓名", + "fontSize" => 14, + "fontWeight" => "bold", + "textColor" => "#303133", + "pageStartBgColor" => "#FFFFFF", + "pageEndBgColor" => "", + "pageGradientAngle" => "to bottom", + "componentBgUrl" => "", + "componentBgAlpha" => 2, + "componentStartBgColor" => "", + "componentEndBgColor" => "", + "componentGradientAngle" => "to bottom", + "topRounded" => 0, + "bottomRounded" => 0, + "elementBgColor" => "", + "topElementRounded" => 0, + "bottomElementRounded" => 0, + "margin" => [ + "top" => 15, + "bottom" => 10, + "both" => 25 + ], + "isHidden" => false, + "pageStyle" => "background-color:#FFFFFF;padding-top:30rpx;padding-bottom:20rpx;padding-right:34rpx;padding-left:34rpx;" + ], + [ + "path" => "edit-form-identity", + "uses" => 1, + "componentType" => "diy_form", + "id" => "4hy63cm1lj80", + "componentName" => "FormIdentity", + "componentTitle" => "身份证号", + "ignore" => [ + "componentBgUrl" + ], + "field" => [ + "name" => "身份证号", + "remark" => [ + "text" => "", + "color" => "#999999", + "fontSize" => 14 + ], + "required" => false, + "unique" => true, + "autofill" => false, + "privacyProtection" => false, + 'cache' => true, + "default" => "", + "value" => "" + ], + "placeholder" => "请输入身份证号", + "fontSize" => 14, + "fontWeight" => "bold", + "textColor" => "#303133", + "pageStartBgColor" => "#FFFFFF", + "pageEndBgColor" => "", + "pageGradientAngle" => "to bottom", + "componentBgUrl" => "", + "componentBgAlpha" => 2, + "componentStartBgColor" => "", + "componentEndBgColor" => "", + "componentGradientAngle" => "to bottom", + "topRounded" => 0, + "bottomRounded" => 0, + "elementBgColor" => "", + "topElementRounded" => 0, + "bottomElementRounded" => 0, + "margin" => [ + "top" => 5, + "bottom" => 10, + "both" => 25 + ], + "isHidden" => false, + "pageStyle" => "background-color:#FFFFFF;padding-top:10rpx;padding-bottom:20rpx;padding-right:34rpx;padding-left:34rpx;" + ], + [ + "path" => "edit-form-email", + "uses" => 0, + "componentType" => "diy_form", + "id" => "13f2w3r9h9vg", + "componentName" => "FormEmail", + "componentTitle" => "邮箱", + "ignore" => [ + "componentBgUrl" + ], + "field" => [ + "name" => "邮箱", + "remark" => [ + "text" => "", + "color" => "#999999", + "fontSize" => 14 + ], + "required" => false, + "unique" => false, + "autofill" => false, + "privacyProtection" => false, + 'cache' => true, + "default" => "", + "value" => "" + ], + "placeholder" => "请输入邮箱", + "fontSize" => 14, + "fontWeight" => "bold", + "textColor" => "#303133", + "pageStartBgColor" => "#FFFFFF", + "pageEndBgColor" => "", + "pageGradientAngle" => "to bottom", + "componentBgUrl" => "", + "componentBgAlpha" => 2, + "componentStartBgColor" => "", + "componentEndBgColor" => "", + "componentGradientAngle" => "to bottom", + "topRounded" => 0, + "bottomRounded" => 0, + "elementBgColor" => "", + "topElementRounded" => 0, + "bottomElementRounded" => 0, + "margin" => [ + "top" => 5, + "bottom" => 10, + "both" => 25 + ], + "isHidden" => false, + "pageStyle" => "background-color:#FFFFFF;padding-top:10rpx;padding-bottom:20rpx;padding-right:34rpx;padding-left:34rpx;" + ], + [ + "path" => "edit-form-checkbox", + "uses" => 0, + "convert" => [], + "componentType" => "diy_form", + "id" => "4jcvmb2asve0", + "componentName" => "FormCheckbox", + "componentTitle" => "多选项", + "ignore" => [ + "componentBgUrl" + ], + "field" => [ + "name" => "职业", + "remark" => [ + "text" => "", + "color" => "#999999", + "fontSize" => 14 + ], + "required" => true, + "unique" => false, + "autofill" => false, + "privacyProtection" => false, + 'cache' => true, + "default" => [], + "value" => [] + ], + "fontSize" => 14, + "fontWeight" => "bold", + "style" => "style-3", + "options" => [ + [ + "id" => "incszbphksdt", + "text" => "选项1" + ], + [ + "id" => "dzcjgipwkffx", + "text" => "选项2" + ] + ], + "selectableNum" => [ + "min" => 0, + "max" => 0 + ], + "textColor" => "#303133", + "pageStartBgColor" => "#FFFFFF", + "pageEndBgColor" => "", + "pageGradientAngle" => "to bottom", + "componentBgUrl" => "", + "componentBgAlpha" => 2, + "componentStartBgColor" => "", + "componentEndBgColor" => "", + "componentGradientAngle" => "to bottom", + "topRounded" => 0, + "bottomRounded" => 0, + "elementBgColor" => "", + "topElementRounded" => 0, + "bottomElementRounded" => 0, + "margin" => [ + "top" => 5, + "bottom" => 10, + "both" => 25 + ], + "isHidden" => false, + ], + [ + "path" => "edit-form-textarea", + "uses" => 0, + "componentType" => "diy_form", + "id" => "64a0gh89tz40", + "componentName" => "FormTextarea", + "componentTitle" => "多行文本", + "ignore" => [ + "componentBgUrl" + ], + "field" => [ + "name" => "爱好", + "remark" => [ + "text" => "", + "color" => "#999999", + "fontSize" => 14 + ], + "required" => false, + "unique" => false, + "autofill" => false, + "privacyProtection" => false, + 'cache' => true, + "default" => "", + "value" => "" + ], + "placeholder" => "请输入特长优点", + "fontSize" => 14, + "fontWeight" => "bold", + "rowCount" => 4, + "textColor" => "#303133", + "pageStartBgColor" => "#FFFFFF", + "pageEndBgColor" => "", + "pageGradientAngle" => "to bottom", + "componentBgUrl" => "", + "componentBgAlpha" => 2, + "componentStartBgColor" => "", + "componentEndBgColor" => "", + "componentGradientAngle" => "to bottom", + "topRounded" => 0, + "bottomRounded" => 0, + "elementBgColor" => "", + "topElementRounded" => 0, + "bottomElementRounded" => 0, + "margin" => [ + "top" => 5, + "bottom" => 10, + "both" => 25 + ], + "isHidden" => false, + "pageStyle" => "background-color:#FFFFFF;padding-top:10rpx;padding-bottom:20rpx;padding-right:34rpx;padding-left:34rpx;" + ], + [ + "path" => "edit-form-submit", + "uses" => 1, + "position" => "bottom_fixed", + "componentType" => "diy_form", + "id" => "38b02iygfzc0", + "componentName" => "FormSubmit", + "componentTitle" => "表单提交", + "ignore" => [ + "componentBgUrl" + ], + "btnPosition" => "follow_content", + "submitBtn" => [ + "text" => "提交", + "color" => "#ffffff", + "bgColor" => "#409EFF" + ], + "resetBtn" => [ + "control" => true, + "text" => "重置", + "color" => "", + "bgColor" => "" + ], + "textColor" => "#303133", + "pageStartBgColor" => "", + "pageEndBgColor" => "", + "pageGradientAngle" => "to bottom", + "componentBgUrl" => "", + "componentBgAlpha" => 2, + "componentStartBgColor" => "", + "componentEndBgColor" => "", + "componentGradientAngle" => "to bottom", + "topRounded" => 0, + "bottomRounded" => 0, + "elementBgColor" => "", + "topElementRounded" => 50, + "bottomElementRounded" => 50, + "margin" => [ + "top" => 5, + "bottom" => 5, + "both" => 25 + ], + "isHidden" => false, + "pageStyle" => "padding-top:10rpx;padding-bottom:10rpx;padding-right:20rpx;padding-left:20rpx;" + ] + ] + ] + ], + ], // todo 靠后完善 // 'SIGN_REGISTRATION' => [ // 'active_sign_up' => [ // 页面标识 diff --git a/niucloud/app/dict/diy_form/TypeDict.php b/niucloud/app/dict/diy_form/TypeDict.php index 90e9d3544..175d77aac 100644 --- a/niucloud/app/dict/diy_form/TypeDict.php +++ b/niucloud/app/dict/diy_form/TypeDict.php @@ -11,6 +11,7 @@ namespace app\dict\diy_form; +use app\dict\sys\AppTypeDict; use core\dict\DictLoader; /** @@ -34,6 +35,15 @@ class TypeDict 'sort' => 10001, 'addon' => '' ], + //个人资料 + 'DIY_FORM_MEMBER_INFO' => [ + 'title' => get_lang('dict_diy_form.type_diy_form_member_info'), + 'preview' => 'static/resource/images/diy_form/diy_form_member_info_preview.jpg', // 预览图 + 'sort' => 10002, + 'addon' => '', + 'app_type' => [AppTypeDict::ADMIN], + "show_submit" => true, // 是否显示表单提交组件 + ], //签到报名登记 todo 靠后完善 // 'SIGN_REGISTRATION' => [ // 'title' => get_lang('dict_diy_form.type_sign_registration'), diff --git a/niucloud/app/dict/menu/site.php b/niucloud/app/dict/menu/site.php index 0f6e6a7ee..53b19c22e 100644 --- a/niucloud/app/dict/menu/site.php +++ b/niucloud/app/dict/menu/site.php @@ -6,7 +6,7 @@ return [ 'menu_short_name' => '装修', 'parent_key' => '', 'menu_type' => '0', - 'icon' => 'element Brush', + 'icon' => 'iconfont iconzhuangxiu3', 'api_url' => '', 'router_path' => '', 'view_path' => '', @@ -19,6 +19,7 @@ return [ 'menu_name' => '编辑', 'menu_key' => 'diy_tabbar_edit', 'menu_short_name' => '编辑', + 'parent_select_key' => 'diy_bottom', 'menu_type' => '1', 'icon' => '', 'api_url' => 'diy/bottom/edit', @@ -279,6 +280,7 @@ return [ 'menu_name' => '海报装修', 'menu_key' => 'poster_decorate', 'menu_short_name' => '海报装修', + 'parent_select_key' => 'poster_management', 'menu_type' => '1', 'icon' => '', 'api_url' => 'poster/', @@ -339,7 +341,7 @@ return [ 'menu_short_name' => '会员', 'parent_key' => '', 'menu_type' => '0', - 'icon' => 'iconfont iconjiaoseyonghu', + 'icon' => 'iconfont iconhuiyuan', 'api_url' => '', 'router_path' => '', 'view_path' => '', @@ -410,6 +412,7 @@ return [ 'menu_name' => '会员详情', 'menu_key' => 'member_info', 'menu_short_name' => '会员详情', + 'parent_select_key' => 'member_list', 'menu_type' => '1', 'icon' => '', 'api_url' => 'member/member/', @@ -752,7 +755,7 @@ return [ 'menu_short_name' => '财务', 'parent_key' => '', 'menu_type' => '0', - 'icon' => 'element Box', + 'icon' => 'iconfont iconcaiwu1', 'api_url' => '', 'router_path' => '', 'view_path' => '', @@ -867,6 +870,7 @@ return [ 'menu_name' => '退款详情', 'menu_key' => 'member_refund_detail', 'menu_short_name' => '退款详情', + 'parent_select_key' => 'member_refund_list', 'menu_type' => '1', 'icon' => 'iconfont iconhuiyuantixian', 'api_url' => 'pay/refund/', @@ -885,7 +889,7 @@ return [ 'menu_short_name' => '营销', 'parent_key' => '', 'menu_type' => '0', - 'icon' => 'iconfont iconyingxiao', + 'icon' => 'iconfont iconyingxiao2', 'api_url' => '', 'router_path' => '', 'view_path' => '', @@ -895,167 +899,181 @@ return [ 'is_show' => '1', 'children' => [ [ - 'menu_name' => '核销管理', - 'menu_key' => 'verify', - 'menu_short_name' => '核销管理', + 'menu_name' => '营销列表', + 'menu_key' => 'marketing_list', + 'menu_short_name' => '营销列表', + 'menu_type' => '1', + 'icon' => 'iconfont iconmanage-apply', + 'api_url' => 'marketing/list', + 'router_path' => 'app/marketing', + 'view_path' => 'app/marketing', + 'methods' => 'get', + 'sort' => '50', + 'status' => '1', + 'is_show' => '1', + ], + ], + ], + [ + 'menu_name' => '核销管理', + 'menu_key' => 'verify', + 'menu_short_name' => '核销管理', + 'menu_type' => '0', + 'icon' => '', + 'api_url' => '', + 'router_path' => '', + 'view_path' => '', + 'methods' => 'get', + 'sort' => '48', + 'status' => '1', + 'is_show' => '0', + 'children' => [ + [ + 'menu_name' => '核销员', + 'menu_key' => 'verifier_list', + 'menu_short_name' => '核销员', 'menu_type' => '1', 'icon' => '', - 'api_url' => '', - 'router_path' => '', - 'view_path' => '', + 'api_url' => 'verify/verifier', + 'router_path' => 'marketing/verifier', + 'view_path' => 'marketing/verifier', 'methods' => 'get', 'sort' => '48', 'status' => '1', 'is_show' => '1', 'children' => [ [ - 'menu_name' => '核销员', - 'menu_key' => 'verifier_list', - 'menu_short_name' => '核销员', - 'menu_type' => '1', + 'menu_name' => '添加核销员', + 'menu_key' => 'add_verifier', + 'menu_short_name' => '添加核销员', + 'menu_type' => '2', 'icon' => '', 'api_url' => 'verify/verifier', - 'router_path' => 'marketing/verifier', - 'view_path' => 'marketing/verifier', - 'methods' => 'get', - 'sort' => '48', - 'status' => '1', - 'is_show' => '1', - 'children' => [ - [ - 'menu_name' => '添加核销员', - 'menu_key' => 'add_verifier', - 'menu_short_name' => '添加核销员', - 'menu_type' => '2', - 'icon' => '', - 'api_url' => 'verify/verifier', - 'router_path' => '', - 'view_path' => '', - 'methods' => 'post', - 'sort' => '100', - 'status' => '1', - 'is_show' => '1', - ], - [ - 'menu_name' => '编辑核销员', - 'menu_key' => 'edit_verifier', - 'menu_short_name' => '编辑核销员', - 'menu_type' => '2', - 'icon' => '', - 'api_url' => 'verify/verifier/', - 'router_path' => '', - 'view_path' => '', - 'methods' => 'post', - 'sort' => '100', - 'status' => '1', - 'is_show' => '1', - ], - [ - 'menu_name' => '删除核销员', - 'menu_key' => 'delete_verifier', - 'menu_short_name' => '删除核销员', - 'menu_type' => '2', - 'icon' => '', - 'api_url' => 'verify/verifier/', - 'router_path' => '', - 'view_path' => '', - 'methods' => 'delete', - 'sort' => '100', - 'status' => '1', - 'is_show' => '1', - ] - ] - ], - [ - 'menu_name' => '核销记录', - 'menu_key' => 'verify_list', - 'menu_short_name' => '核销记录', - 'menu_type' => '1', - 'icon' => '', - 'api_url' => 'verify/verify/record', - 'router_path' => 'marketing/verify', - 'view_path' => 'marketing/verify', - 'methods' => 'get', - 'sort' => '48', + 'router_path' => '', + 'view_path' => '', + 'methods' => 'post', + 'sort' => '100', 'status' => '1', 'is_show' => '1', ], [ - 'menu_name' => '核销详情', - 'menu_key' => 'verify_detail', - 'menu_short_name' => '核销详情', - 'menu_type' => '1', + 'menu_name' => '编辑核销员', + 'menu_key' => 'edit_verifier', + 'menu_short_name' => '编辑核销员', + 'menu_type' => '2', 'icon' => '', - 'api_url' => 'verify/verify/', - 'router_path' => 'marketing/verify/detail', - 'view_path' => 'marketing/verify_detail', - 'methods' => 'get', - 'sort' => '48', + 'api_url' => 'verify/verifier/', + 'router_path' => '', + 'view_path' => '', + 'methods' => 'post', + 'sort' => '100', 'status' => '1', - 'is_show' => '0', + 'is_show' => '1', + ], + [ + 'menu_name' => '删除核销员', + 'menu_key' => 'delete_verifier', + 'menu_short_name' => '删除核销员', + 'menu_type' => '2', + 'icon' => '', + 'api_url' => 'verify/verifier/', + 'router_path' => '', + 'view_path' => '', + 'methods' => 'delete', + 'sort' => '100', + 'status' => '1', + 'is_show' => '1', ] - ], + ] ], [ - 'menu_name' => '签到管理', - 'menu_key' => 'sign', - 'menu_short_name' => '签到管理', + 'menu_name' => '核销记录', + 'menu_key' => 'verify_list', + 'menu_short_name' => '核销记录', + 'menu_type' => '1', + 'icon' => '', + 'api_url' => 'verify/verify/record', + 'router_path' => 'marketing/verify', + 'view_path' => 'marketing/verify', + 'methods' => 'get', + 'sort' => '48', + 'status' => '1', + 'is_show' => '1', + ], + [ + 'menu_name' => '核销详情', + 'menu_key' => 'verify_detail', + 'menu_short_name' => '核销详情', + 'menu_type' => '1', + 'icon' => '', + 'api_url' => 'verify/verify/', + 'router_path' => 'marketing/verify/detail', + 'view_path' => 'marketing/verify_detail', + 'methods' => 'get', + 'sort' => '48', + 'status' => '1', + 'is_show' => '0', + ] + ], + ], + [ + 'menu_name' => '签到管理', + 'menu_key' => 'sign', + 'menu_short_name' => '签到管理', + 'menu_type' => '0', + 'icon' => 'element FolderChecked', + 'api_url' => '', + 'router_path' => '', + 'view_path' => '', + 'methods' => 'get', + 'sort' => '30', + 'status' => '1', + 'is_show' => '0', + 'children' => [ + [ + 'menu_name' => '签到设置', + 'menu_key' => 'sign_set', + 'menu_short_name' => '签到设置', 'menu_type' => '1', 'icon' => 'element FolderChecked', - 'api_url' => '', - 'router_path' => '', - 'view_path' => '', + 'api_url' => 'member/sign/config', + 'router_path' => 'marketing/sign/config', + 'view_path' => 'marketing/sign_config', 'methods' => 'get', 'sort' => '30', 'status' => '1', 'is_show' => '1', 'children' => [ [ - 'menu_name' => '签到设置', - 'menu_key' => 'sign_set', - 'menu_short_name' => '签到设置', - 'menu_type' => '1', - 'icon' => 'element FolderChecked', + 'menu_name' => '保存', + 'menu_key' => 'save_sign_set', + 'menu_short_name' => '保存', + 'menu_type' => '2', + 'icon' => '', 'api_url' => 'member/sign/config', - 'router_path' => 'marketing/sign/config', - 'view_path' => 'marketing/sign_config', - 'methods' => 'get', - 'sort' => '30', - 'status' => '1', - 'is_show' => '1', - 'children' => [ - [ - 'menu_name' => '保存', - 'menu_key' => 'save_sign_set', - 'menu_short_name' => '保存', - 'menu_type' => '2', - 'icon' => '', - 'api_url' => 'member/sign/config', - 'router_path' => '', - 'view_path' => '', - 'methods' => 'put', - 'sort' => '100', - 'status' => '1', - 'is_show' => '1', - ] - ] - ], - [ - 'menu_name' => '签到记录', - 'menu_key' => 'sign_list', - 'menu_short_name' => '签到记录', - 'menu_type' => '1', - 'icon' => 'element FolderChecked', - 'api_url' => 'member/sign', - 'router_path' => 'marketing/sign', - 'view_path' => 'marketing/sign_list', - 'methods' => 'get', - 'sort' => '30', + 'router_path' => '', + 'view_path' => '', + 'methods' => 'put', + 'sort' => '100', 'status' => '1', 'is_show' => '1', ] - ], + ] ], + [ + 'menu_name' => '签到记录', + 'menu_key' => 'sign_list', + 'menu_short_name' => '签到记录', + 'menu_type' => '1', + 'icon' => 'element FolderChecked', + 'api_url' => 'member/sign', + 'router_path' => 'marketing/sign', + 'view_path' => 'marketing/sign_list', + 'methods' => 'get', + 'sort' => '30', + 'status' => '1', + 'is_show' => '1', + ] ], ], [ @@ -1064,7 +1082,7 @@ return [ 'menu_short_name' => '应用', 'parent_key' => '', 'menu_type' => '0', - 'icon' => 'iconfont iconmanage-apply', + 'icon' => 'iconfont iconyingyong21', 'api_url' => '', 'router_path' => '', 'view_path' => '', @@ -1095,7 +1113,7 @@ return [ 'menu_short_name' => '渠道', 'parent_key' => '', 'menu_type' => '0', - 'icon' => 'element DataBoard', + 'icon' => 'iconfont iconqudao', 'api_url' => '', 'router_path' => '', 'view_path' => '', @@ -1568,7 +1586,7 @@ return [ 'menu_short_name' => '权限', 'parent_key' => '', 'menu_type' => '0', - 'icon' => 'element Lock', + 'icon' => 'iconfont iconquanxian', 'api_url' => '', 'router_path' => '', 'view_path' => '', @@ -1771,7 +1789,7 @@ return [ 'menu_short_name' => '设置', 'parent_key' => '', 'menu_type' => '0', - 'icon' => 'element Setting', + 'icon' => 'iconfont iconshezhi3', 'api_url' => '', 'router_path' => '', 'view_path' => '', @@ -2416,6 +2434,7 @@ return [ 'menu_name' => '页面装修', 'menu_key' => 'decorate', 'menu_short_name' => '页面装修', + 'parent_select_key' => 'diy', 'parent_key' => '', 'menu_type' => '0', 'icon' => '', @@ -2636,6 +2655,7 @@ return [ 'menu_name' => '添加打印机', 'menu_key' => 'printer_add', 'menu_short_name' => '添加打印机', + 'parent_select_key' => 'printer_management_list', 'menu_type' => '1', 'icon' => '', 'api_url' => 'printer', @@ -2650,6 +2670,7 @@ return [ 'menu_name' => '编辑打印机', 'menu_key' => 'printer_edit', 'menu_short_name' => '添加打印机', + 'parent_select_key' => 'printer_management_list', 'menu_type' => '1', 'icon' => '', 'api_url' => 'printer/', @@ -2694,6 +2715,7 @@ return [ 'menu_name' => '添加打印模板', 'menu_key' => 'printer_template_add', 'menu_short_name' => '添加打印模板', + 'parent_select_key' => 'printer_template_management', 'menu_type' => '1', 'icon' => '', 'api_url' => 'printer/template', @@ -2708,6 +2730,7 @@ return [ 'menu_name' => '编辑打印模板', 'menu_key' => 'printer_template_edit', 'menu_short_name' => '编辑打印模板', + 'parent_select_key' => 'printer_template_management', 'menu_type' => '1', 'icon' => '', 'api_url' => 'printer/template/', diff --git a/niucloud/app/dict/notice/NoticeDict.php b/niucloud/app/dict/notice/NoticeDict.php index 1337d5f39..3a14d4c18 100644 --- a/niucloud/app/dict/notice/NoticeDict.php +++ b/niucloud/app/dict/notice/NoticeDict.php @@ -99,6 +99,7 @@ class NoticeDict $keys = array_keys($item); if ($key && !in_array($key, $keys)) { unset($notice_template_list[$addon]); + continue; } foreach ($item as $template_key => $value) { if ($key && $template_key != $key) { diff --git a/niucloud/app/dict/notice/NoticeTypeDict.php b/niucloud/app/dict/notice/NoticeTypeDict.php index fc771c4c4..a7824e291 100644 --- a/niucloud/app/dict/notice/NoticeTypeDict.php +++ b/niucloud/app/dict/notice/NoticeTypeDict.php @@ -20,6 +20,8 @@ class NoticeTypeDict //微信小程序 public const WEAPP = 'weapp'; + public const TEMPLATE_AUDIT_STATUS_NEED_AGAIN_REPORT = -3; + public const TEMPLATE_AUDIT_STATUS_NEED_EDIT = -2; public const TEMPLATE_AUDIT_STATUS_NOT_REPORT = -1; public const TEMPLATE_AUDIT_STATUS_WAIT = 1; public const TEMPLATE_AUDIT_STATUS_PASS = 2; @@ -71,6 +73,8 @@ class NoticeTypeDict public static function getTemplateAuditStatus($type = '') { $data = [ + self::TEMPLATE_AUDIT_STATUS_NEED_AGAIN_REPORT => get_lang('dict_sms_api.template_status_again_report'), + self::TEMPLATE_AUDIT_STATUS_NEED_EDIT => get_lang('dict_sms_api.template_status_need_edit'), self::TEMPLATE_AUDIT_STATUS_NOT_REPORT => get_lang('dict_sms_api.template_status_not_report'), self::TEMPLATE_AUDIT_STATUS_WAIT => get_lang('dict_sms_api.template_status_wait'), self::TEMPLATE_AUDIT_STATUS_PASS => get_lang('dict_sms_api.template_status_pass'), @@ -148,19 +152,25 @@ class NoticeTypeDict 'name' => '验证码', 'type' => self::PARAMS_TYPE_VALID_CODE, 'desc' => '4-6位纯数字', - 'rule' => '/^\d{4,6}$/', + 'rule' => '/^\d$/', + 'min'=>4, + 'max'=>6 ], [ 'name' => '手机号', 'type' => self::PARAMS_TYPE_MOBILE_NUMBER, 'desc' => '1-15位纯数字', - 'rule' => '/^\d{1,15}$/', + 'rule' => '/^\d$/', + 'min'=>1, + 'max'=>15 ], [ 'name' => '其他号码', 'type' => self::PARAMS_TYPE_OTHER_NUMBER, 'desc' => '1-32位字母+数字组合', - 'rule'=>'/^[a-zA-Z0-9]{1,32}$/' + 'rule'=>'/^[a-zA-Z0-9]$/', + 'min'=>1, + 'max'=>32 ], [ 'name' => '金额', @@ -178,13 +188,17 @@ class NoticeTypeDict 'name' => '中文', 'type' => self::PARAMS_TYPE_CHINESE, 'desc' => '1-32中文，支持中文园括号()', - 'rule' => '/^[\p{Han}()（）]{1,32}$/u' + 'rule' => '/^[\p{Han}()（）]$/u', + 'min'=>1, + 'max'=>32 ], [ 'name' => '其他', 'type' => self::PARAMS_TYPE_OTHERS, 'desc' => ' 1-35个中文数字字母组合，支持中文符号和空格', - 'rule' => '/^[\p{Han}\p{N}\p{L}\p{P}\p{S}\s]{1,35}$/u', + 'rule' => '/^[\p{Han}\p{N}\p{L}\p{P}\p{S}\s]$/u', + 'min'=>1, + 'max'=>35 ], ]; } diff --git a/niucloud/app/dict/schedule/schedule.php b/niucloud/app/dict/schedule/schedule.php index 2a8d22691..4ff4eb415 100644 --- a/niucloud/app/dict/schedule/schedule.php +++ b/niucloud/app/dict/schedule/schedule.php @@ -61,6 +61,18 @@ return [ ], 'class' => 'app\job\upgrade\AutoClearUpgradeRecords', 'function' => '' + ],[ + 'key' => 'auto_clear_user_log', + 'name' => '定时清理用户操作日志', + 'desc' => '', + 'time' => [ + 'type' => 'day', + 'day' => 1, + 'hour' => 1, + 'min' => 1 + ], + 'class' => 'app\job\sys\ClearUserLog', + 'function' => '' ], // [ // 'key' => 'site_stat', diff --git a/niucloud/app/dict/sys/ConfigKeyDict.php b/niucloud/app/dict/sys/ConfigKeyDict.php index a58d938b5..0099f7da7 100644 --- a/niucloud/app/dict/sys/ConfigKeyDict.php +++ b/niucloud/app/dict/sys/ConfigKeyDict.php @@ -39,4 +39,5 @@ class ConfigKeyDict public const WECHAT_TRANSFER_SCENE_CONFIG = 'WECHAT_TRANSFER_SCENE_CONFIG';//微信转账场景配置 public const SMS = 'SMS';//短信配置 + public const SHOP_THIRD_PARTY_DELIVERY_CONFIG = 'SHOP_THREE_PARTY_DELIVERY_CONFIG';//短信配置 } diff --git a/niucloud/app/event.php b/niucloud/app/event.php index 1520cda33..da31a3f3e 100644 --- a/niucloud/app/event.php +++ b/niucloud/app/event.php @@ -12,6 +12,8 @@ $system_event = [ * 系统事件 */ 'AppInit' => [ 'app\listener\system\AppInitListener' ], + //站点初始化 + 'SiteInit' => [ 'app\listener\system\SiteInitListener' ], // 站点创建之后 'AddSiteAfter' => [ 'app\listener\system\AddSiteAfterListener' @@ -124,6 +126,9 @@ $system_event = [ 'ShowApp' => [ 'app\listener\system\ShowAppListener' ], + 'ShowMarketing' => [ + 'app\listener\system\ShowMarketingListener' + ], //获取微信转账场景配置 'GetWechatTransferTradeScene' => [ 'app\listener\transfer\TransferCashOutListener' diff --git a/niucloud/app/install/source/database.sql b/niucloud/app/install/source/database.sql index 19ea94fbc..73c30ccec 100644 --- a/niucloud/app/install/source/database.sql +++ b/niucloud/app/install/source/database.sql @@ -193,7 +193,7 @@ CREATE TABLE `diy_page` ( `title` varchar(255) NOT NULL DEFAULT '' COMMENT '页面标题（用于前台展示）', `name` varchar(255) NOT NULL DEFAULT '' COMMENT '页面标识', `type` varchar(255) NOT NULL DEFAULT '' COMMENT '页面模板', - `template` varchar(255) NOT NULL DEFAULT '' COMMENT '模板名称', + `template` varchar(255) NOT NULL DEFAULT '' COMMENT '页面模板名称', `mode` varchar(255) NOT NULL DEFAULT 'diy' COMMENT '页面展示模式，diy：自定义，fixed：固定', `value` longtext COMMENT '页面数据，json格式', `is_default` int(11) NOT NULL DEFAULT 0 COMMENT '是否默认页面，1：是，0：否', @@ -343,6 +343,7 @@ CREATE TABLE `member` ( `sex` tinyint(4) NOT NULL DEFAULT 0 COMMENT '性别 0保密 1男 2女', `status` tinyint(4) NOT NULL DEFAULT 1 COMMENT '用户状态 用户状态默认为1', `birthday` varchar(20) NOT NULL DEFAULT '' COMMENT '出生日期', + `id_card` varchar(30) NOT NULL DEFAULT '' COMMENT '身份证号', `point` int(11) NOT NULL DEFAULT 0 COMMENT '可用积分', `point_get` int(11) NOT NULL DEFAULT 0 COMMENT '累计获取积分', `balance` decimal(10, 2) NOT NULL DEFAULT 0.00 COMMENT '可用余额', @@ -363,8 +364,7 @@ CREATE TABLE `member` ( `district_id` int(11) NOT NULL DEFAULT 0 COMMENT '区县id', `address` varchar(255) NOT NULL DEFAULT '' COMMENT '详细地址', `location` varchar(255) NOT NULL DEFAULT '' COMMENT '定位地址', - `remark` varchar(255) NOT NULL DEFAULT '' COMMENT '备注', --- `id_card` varchar(50) NOT NULL DEFAULT '' COMMENT '身份证号', + `remark` varchar(300) NOT NULL DEFAULT '' COMMENT '备注', `delete_time` int(11) NOT NULL DEFAULT 0 COMMENT '删除时间', `update_time` int(11) NOT NULL DEFAULT 0 COMMENT '修改时间', PRIMARY KEY (`member_id`) USING BTREE @@ -525,7 +525,6 @@ CREATE TABLE `niu_sms_template` ( PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE utf8mb4_general_ci COMMENT='牛云短信模板表'; - DROP TABLE IF EXISTS `pay`; CREATE TABLE `pay` ( `id` int(10) UNSIGNED NOT NULL AUTO_INCREMENT COMMENT '主键', @@ -929,6 +928,7 @@ CREATE TABLE `sys_menu` ( `addon` varchar(255) NOT NULL DEFAULT '' COMMENT '所属插件', `source` varchar(255) NOT NULL DEFAULT 'system' COMMENT '菜单来源 system 系统文件 create 新建菜单 generator 代码生成器', `menu_attr` varchar(50) NOT NULL DEFAULT '' COMMENT '菜单属性 common 公共 system 系统', + `parent_select_key` VARCHAR(255) NOT NULL DEFAULT '' COMMENT '上级key', PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '菜单表' ROW_FORMAT = Dynamic; @@ -1137,7 +1137,8 @@ CREATE TABLE `sys_user_log` ( `site_id` int(11) NOT NULL DEFAULT 0 COMMENT '站点id', `uid` int(10) UNSIGNED NOT NULL DEFAULT 0 COMMENT '管理员id', `username` varchar(64) NOT NULL DEFAULT '' COMMENT '管理员姓名', - `url` varchar(128) NOT NULL DEFAULT '' COMMENT '链接', + `operation` varchar(100) NOT NULL DEFAULT '' COMMENT '操作描述', + `url` varchar(300) NOT NULL DEFAULT '' COMMENT '链接', `params` longtext DEFAULT NULL COMMENT '参数', `type` varchar(32) NOT NULL DEFAULT '' COMMENT '请求方式', `create_time` int(10) UNSIGNED NOT NULL DEFAULT 0 COMMENT '操作时间', diff --git a/niucloud/app/dict/sys/IconDict.php b/niucloud/app/job/sys/ClearUserLog.php similarity index 68% rename from niucloud/app/dict/sys/IconDict.php rename to niucloud/app/job/sys/ClearUserLog.php index dd91790ee..4253cd944 100644 --- a/niucloud/app/dict/sys/IconDict.php +++ b/niucloud/app/job/sys/ClearUserLog.php @@ -9,22 +9,17 @@ // | Author: Niucloud Team // +---------------------------------------------------------------------- -namespace app\dict\sys; +namespace app\job\sys; -use core\dict\DictLoader; +use app\model\sys\SysUserLog; +use core\base\BaseJob; -/** - * 获取图标 - * Class IconDict - * @package app\dict\sys - */ -class IconDict + +class ClearUserLog extends BaseJob { - - public static function getIcon($params = []) + public function doJob() { - $system_pages = []; - return (new DictLoader("Icon"))->load($system_pages); + (new SysUserLog())->where('create_time','<',time()-7*24*60*60)->delete(); + return true; } - -} \ No newline at end of file +} diff --git a/niucloud/app/lang/zh-cn/api.php b/niucloud/app/lang/zh-cn/api.php index 0377611ae..fde85af42 100644 --- a/niucloud/app/lang/zh-cn/api.php +++ b/niucloud/app/lang/zh-cn/api.php @@ -65,6 +65,7 @@ return [ 'UPGRADE_BACKUP_SQL_NOT_FOUND' => '未找到备份的数据库文件', 'NOT_EXIST_UPGRADE_CONTENT' => '没有获取到可以升级的内容', 'CLOUD_BUILD_AUTH_CODE_NOT_FOUND' => '请先填写授权码', + 'TASK_CYCLE_ERROR' => '任务周期填写错误', //登录注册重置账号.... 'LOGIN_SUCCESS' => '登录成功', @@ -354,9 +355,12 @@ return [ 'ACCOUNT_ERROR_RELOGIN' => '牛云短信账号异常,请重新登录账号', 'ACCOUNT_BIND_MOBILE_ERROR' => '手机号错误', 'TEMPLATE_NOT_SMS_CONTENT' => '当前模版未配置短信内容', - 'TEMPLATE_ERROR' => '短信模版ID错误或审核未通过', + 'TEMPLATE_IS_PASS' => '审核通过的模版不允许修改', 'TEMPLATE_NOT_REPORT' => '短信模版暂未报备', 'URL_NOT_FOUND' => '未配置远程服务地址，请在ENV中配置{NIU_SHOP_PREFIX}', 'SYSTEM_IS_ERROR' => '远程服务器异常，请联系售后人员', + + 'TEMPLATE_ERROR' => '短信模版ID错误或审核未通过', + 'TEMPLATE_USE_ERROR' => '短信模版参数不一致需修改/重新报备', /*******************************************牛云短信 end ********************************************************/ ]; diff --git a/niucloud/app/lang/zh-cn/dict.php b/niucloud/app/lang/zh-cn/dict.php index 69c925ee0..9d883df49 100644 --- a/niucloud/app/lang/zh-cn/dict.php +++ b/niucloud/app/lang/zh-cn/dict.php @@ -77,7 +77,8 @@ return [ 'var_point' => '会员积分', ], 'dict_sms_api'=>[ - + 'template_status_again_report'=>'需重新报备', + 'template_status_need_edit'=>'需修改报备参数', 'template_status_not_report'=>'未报备', 'template_status_wait'=>'待审核', 'template_status_pass'=>'审核通过', @@ -284,6 +285,7 @@ return [ 'dict_diy_form' => [ 'component_type_form' => '表单组件', 'type_diy_form' => '自定义表单', + 'type_diy_form_member_info' => '个人资料', 'type_sign_registration' => '签到报名登记', 'type_leave_message_suggestion' => '留言建议', 'type_write_off_voucher' => '核销凭证', @@ -442,5 +444,23 @@ return [ 'ready' => '准备执行', 'complete' => '完成', 'fail' => '失败' + ], + 'common_active_short'=>[ + 'impulse_buy_short'=>'顺', + 'impulse_buy_name'=>'顺手买', + 'gift_card_short'=>'礼', + 'gift_card_name'=>'礼品卡', + 'discount_short'=>'折', + 'discount_name'=>'限时折扣', + 'exchange_short'=>'积', + 'exchange_name'=>'积分商城', + 'manjiansong_short'=>'满减', + 'manjiansong_name'=>'满减送', + 'newcomer_discount_short'=>'新', + 'newcomer_discount_name'=>'新人专项', + 'pintuan_short'=>'拼', + 'pintuan_name'=>'拼团', + 'seckill_short'=>'秒', + 'seckill_name'=>'秒杀', ] ]; diff --git a/niucloud/app/listener/notice/Sms.php b/niucloud/app/listener/notice/Sms.php index e5b71c26c..0c7042b47 100644 --- a/niucloud/app/listener/notice/Sms.php +++ b/niucloud/app/listener/notice/Sms.php @@ -13,24 +13,25 @@ class Sms public function handle(array $data) { - $site_id = $data['site_id']; - $template = $data['template'];//模板 - $vars = $data['vars'];//模板变量 - $key = $data['key']; - $to = $data['to'];//发送对象主题 - $mobile = $to['mobile'] ?? ''; + $site_id = $data[ 'site_id' ]; + $template = $data[ 'template' ];//模板 + $vars = $data[ 'vars' ];//模板变量 + $key = $data[ 'key' ]; + $to = $data[ 'to' ];//发送对象主题 + $mobile = $to[ 'mobile' ] ?? ''; //完全信任消息的设置, 不再依赖support_type - if ($template['is_sms']) { - $sms_id = $template['sms_id'];//发送模板id - $content = $template['sms']['content']; - $member_id = $to['member_id'] ?? 0; - $uid = $to['uid'] ?? 0; + if ($template[ 'is_sms' ]) { + $sms_id = $template[ 'sms_id' ];//发送模板id + $content = $template[ 'sms' ][ 'content' ]; + $url_params = $template[ 'sms' ][ 'url_params' ] ?? []; + $member_id = $to[ 'member_id' ] ?? 0; + $uid = $to[ 'uid' ] ?? 0; if (!$mobile) { //会员的 if ($member_id > 0) {//查询openid - $info = (new CoreMemberService())->getInfoByMemberId($site_id, $member_id); - $mobile = $info['mobile'] ?? ''; - $nickname = $info['nickname'] ?? ''; + $info = ( new CoreMemberService() )->getInfoByMemberId($site_id, $member_id); + $mobile = $info[ 'mobile' ] ?? ''; + $nickname = $info[ 'nickname' ] ?? ''; } } @@ -50,18 +51,18 @@ class Sms 'result' => '' ); - $core_sms_service->send($site_id, $mobile, $vars, $key, $sms_id, $content); - (new CoreNoticeLogService())->add($site_id, $log_data); + $core_sms_service->send($site_id, $mobile, $vars, $key, $sms_id, $content, $url_params); + ( new CoreNoticeLogService() )->add($site_id, $log_data); } catch (NoticeException $e) { - $log_data['result'] = $e->getMessage(); - (new CoreNoticeLogService())->add($site_id, $log_data); + $log_data[ 'result' ] = $e->getMessage(); + ( new CoreNoticeLogService() )->add($site_id, $log_data); //这儿决定要不要抛出 - if (!$template['async']) { + if (!$template[ 'async' ]) { throw new NoticeException($e->getMessage()); } } } else { - if (!$template['async']) { + if (!$template[ 'async' ]) { throw new NoticeException('NOTICE_NOT_OPEN_SMS'); } } diff --git a/niucloud/app/listener/system/ShowMarketingListener.php b/niucloud/app/listener/system/ShowMarketingListener.php new file mode 100644 index 000000000..b6ba00d49 --- /dev/null +++ b/niucloud/app/listener/system/ShowMarketingListener.php @@ -0,0 +1,54 @@ + [ + + ], + // 工具 + 'tool' => [ + + ], + // 营销 + 'marketing' => [ + [ + 'title' => '核销管理', + 'desc' => '管理核销员及核销记录', + 'icon' => 'static/resource/images/marketing/verifier.png', + 'key' => 'verify', + 'url' => '/marketing/verifier', + ], + [ + 'title' => '签到管理', + 'desc' => '客户每日签到发放奖励', + 'icon' => 'static/resource/images/marketing/sign.png', + 'key' => 'sign', + 'url' => '/marketing/sign/config', + ], + ] + ]; + } +} diff --git a/niucloud/app/listener/system/SiteInitListener.php b/niucloud/app/listener/system/SiteInitListener.php new file mode 100644 index 000000000..d37b6238f --- /dev/null +++ b/niucloud/app/listener/system/SiteInitListener.php @@ -0,0 +1,89 @@ +siteInitBySiteId($site_id, $this->tables); + + event("AddSiteAfter", [ 'site_id' => $site_id, 'main_app' => [], 'site_addons' => [] ]); + + // 更新微页面数据 + $diy_service = new DiyService(); + $diy_service->loadDiyData([ 'site_id' => $site_id, 'main_app' => $params[ 'main_app' ], 'tag' => 'add' ]); + + return true; + } +} diff --git a/niucloud/app/model/site/Site.php b/niucloud/app/model/site/Site.php index b25ef019e..0266a2f31 100644 --- a/niucloud/app/model/site/Site.php +++ b/niucloud/app/model/site/Site.php @@ -99,8 +99,11 @@ class Site extends BaseModel */ public function searchAppAttr($query, $value, $data) { - if ($value != '') { - $query->where('app', 'like', '%"' . $value . '"%')->whereOr('initalled_addon', 'like', '%"' . $value . '"%'); + if ($value !== '') { + $query->where(function ($subQuery) use ($value) { + $subQuery->where('app', 'like', '%"' . $value . '"%') + ->whereOr('initalled_addon', 'like', '%"' . $value . '"%'); + }); } } diff --git a/niucloud/app/model/sys/SysExport.php b/niucloud/app/model/sys/SysExport.php index 3d78fba9e..faa2ac9ec 100644 --- a/niucloud/app/model/sys/SysExport.php +++ b/niucloud/app/model/sys/SysExport.php @@ -17,7 +17,7 @@ use think\db\Query; /** * 导出报表模型 - * Class SysUserLog + * Class SysExport * @package app\model\sys */ class SysExport extends BaseModel diff --git a/niucloud/app/service/admin/generator/GenerateService.php b/niucloud/app/service/admin/generator/GenerateService.php index cc19694c3..f116e8b95 100644 --- a/niucloud/app/service/admin/generator/GenerateService.php +++ b/niucloud/app/service/admin/generator/GenerateService.php @@ -190,6 +190,9 @@ class GenerateService extends BaseAdminService $table_name = preg_replace("/^{$tablePrefix}/", '', $table_info['Name'], 1); $fields = Db::name($table_name)->getFields(); + $generate_table = (new GenerateTable())->where([ [ 'table_name', '=', $table_name] ])->findOrEmpty(); + if (!$generate_table->isEmpty()) return $generate_table['id']; + $add_table_data = [ 'table_name' => $table_name, 'table_content' => $table_info['Comment'], diff --git a/niucloud/app/service/admin/home/AuthSiteService.php b/niucloud/app/service/admin/home/AuthSiteService.php index 478244981..712695f03 100644 --- a/niucloud/app/service/admin/home/AuthSiteService.php +++ b/niucloud/app/service/admin/home/AuthSiteService.php @@ -12,8 +12,10 @@ namespace app\service\admin\home; +use app\dict\addon\AddonDict; use app\dict\sys\AppTypeDict; use app\dict\sys\MenuTypeDict; +use app\model\addon\Addon; use app\model\site\Site; use app\model\site\SiteGroup; use app\model\sys\SysMenu; @@ -162,6 +164,38 @@ class AuthSiteService extends BaseAdminService } } + /** + * 获取可选择的店铺应用列表 + * @return array + * @throws DataNotFoundException + * @throws DbException + * @throws ModelNotFoundException + */ + public function getSiteGroupAppList() { + if (AuthService::isSuperAdmin()) { + $site_group = (new SiteGroup())->field('app')->select()->toArray(); + } else { + $user_create_limit = (new UserCreateSiteLimit())->where([ ['uid', '=', $this->uid] ])->with(['site_group' => function($query) { + $query->field('group_id,app'); + }])->select()->toArray(); + $site_group = []; + foreach ($user_create_limit as $value){ + $site_group[] = $value[ 'site_group' ]; + } + } + $site_group_app_list = array_unique(array_merge(...array_column($site_group,'app'))); + + $addon_list = (new Addon())->where([ ['status', '=', AddonDict::ON], ['type', '=', AddonDict::APP], ['key', 'in', $site_group_app_list] ])->append(['status_name'])->column('title, icon, key, desc, status, type, support_app', 'key'); + if (!empty($addon_list)) { + foreach ($addon_list as &$data) { + $data[ 'icon' ] = is_file($data[ 'icon' ]) ? image_to_base64($data[ 'icon' ]) : ''; + } + } + return $addon_list; + } + + + /** * 创建站点 * @param array $data diff --git a/niucloud/app/service/admin/install/InstallSystemService.php b/niucloud/app/service/admin/install/InstallSystemService.php index aaf293297..62a2a1edc 100644 --- a/niucloud/app/service/admin/install/InstallSystemService.php +++ b/niucloud/app/service/admin/install/InstallSystemService.php @@ -98,7 +98,8 @@ class InstallSystemService extends BaseAdminService 'sort' => $value[ 'sort' ] ?? '', 'status' => 1, 'is_show' => $value[ 'is_show' ] ?? 1, - 'menu_attr' => $value['menu_attr'] ?? '' + 'menu_attr' => $value['menu_attr'] ?? '', + 'parent_select_key' => $value['parent_select_key'] ?? '' ]; $refer = $value; if (isset($refer[ 'children' ])) { diff --git a/niucloud/app/service/admin/member/MemberCashOutService.php b/niucloud/app/service/admin/member/MemberCashOutService.php index 3defe4e46..a08057869 100644 --- a/niucloud/app/service/admin/member/MemberCashOutService.php +++ b/niucloud/app/service/admin/member/MemberCashOutService.php @@ -37,7 +37,7 @@ class MemberCashOutService extends BaseAdminService public function getPage(array $where = []) { - $field = 'id,member_cash_out.site_id,cash_out_no,member_cash_out.member_id,account_type,transfer_type,transfer_realname,transfer_mobile,transfer_bank,transfer_account,transfer_fail_reason,transfer_status,transfer_time,apply_money,rate,service_money,member_cash_out.money,audit_time,member_cash_out.status,remark,member_cash_out.create_time,refuse_reason,transfer_no, transfer_payment_code'; + $field = 'id,member_cash_out.site_id,cash_out_no,member_cash_out.member_id,account_type,transfer_type,transfer_realname,transfer_mobile,transfer_bank,transfer_account,transfer_fail_reason,transfer_status,transfer_time,apply_money,rate,service_money,member_cash_out.money,audit_time,member_cash_out.status,member_cash_out.remark,member_cash_out.create_time,refuse_reason,transfer_no, transfer_payment_code'; $member_where = []; if(!empty($where['keywords'])) { @@ -133,4 +133,4 @@ class MemberCashOutService extends BaseAdminService return $core_member_cash_out_service->cancel($this->site_id, $id); } -} \ No newline at end of file +} diff --git a/niucloud/app/service/admin/member/MemberService.php b/niucloud/app/service/admin/member/MemberService.php index 2bc718ecd..87314c52d 100644 --- a/niucloud/app/service/admin/member/MemberService.php +++ b/niucloud/app/service/admin/member/MemberService.php @@ -78,7 +78,7 @@ class MemberService extends BaseAdminService */ public function getInfo(int $member_id) { - $field = 'member_id,member_no, site_id, username, mobile, password, register_channel, register_type, nickname, headimg, member_level, member_label, wx_openid, weapp_openid, wx_unionid, ali_openid, douyin_openid, login_ip, login_type, login_channel, login_count, login_time, create_time, last_visit_time, last_consum_time, sex, status, birthday, point, point_get, balance, balance_get, growth, growth_get, is_member, member_time, is_del, province_id, city_id, district_id, address, location, delete_time, money, money_get, commission, commission_get, commission_cash_outing'; + $field = 'member_id,member_no, id_card,remark,site_id, username, mobile, password, register_channel, register_type, nickname, headimg, member_level, member_label, wx_openid, weapp_openid, wx_unionid, ali_openid, douyin_openid, login_ip, login_type, login_channel, login_count, login_time, create_time, last_visit_time, last_consum_time, sex, status, birthday, point, point_get, balance, balance_get, growth, growth_get, is_member, member_time, is_del, province_id, city_id, district_id, address, location, delete_time, money, money_get, commission, commission_get, commission_cash_outing'; return $this->makeUp($this->model->where([['member_id', '=', $member_id], ['site_id', '=', $this->site_id]])->field($field)->with('member_level_name_bind')->append(['register_channel_name', 'register_type_name', 'sex_name', 'login_channel_name', 'login_type_name', 'status_name'])->findOrEmpty()->toArray()); } @@ -156,6 +156,16 @@ class MemberService extends BaseAdminService return (new CoreMemberService())->modify($this->site_id, $member_id, $field, $data); } + /** + * 批量修改字段 + * @param $data + * @return Member + */ + public function batchModify($data) + { + return (new CoreMemberService())->batchModify($this->site_id, $data); + } + /** * 组合整理数据 * @param $data diff --git a/niucloud/app/service/admin/notice/NiuSmsService.php b/niucloud/app/service/admin/notice/NiuSmsService.php index bbc1e3c98..e531a0c56 100644 --- a/niucloud/app/service/admin/notice/NiuSmsService.php +++ b/niucloud/app/service/admin/notice/NiuSmsService.php @@ -100,6 +100,7 @@ class NiuSmsService extends BaseAdminService */ public function registerAccount($data) { + $data['imgUrl'] = !empty($data['imgUrl']) ? request()->domain() . $data['imgUrl'] : ""; $res = $this->niu_service->registerAccount($data); return $res; } @@ -245,6 +246,7 @@ class NiuSmsService extends BaseAdminService */ public function signCreate($username, $params) { + $params['imgUrl'] = !empty($params['imgUrl']) ? request()->domain() . $params['imgUrl'] : ""; $res = $this->niu_service->signCreate($username, $params); if (!empty($res['failList'])) { throw new AdminException($res['failList'][0]['msg']); @@ -292,7 +294,7 @@ class NiuSmsService extends BaseAdminService } } return ['repeat_list' => $repeat_name_arr]; - }else{ + } else { $repeat_name_arr = []; } $this->execsync($sms_type, $username, $template_list); @@ -371,7 +373,7 @@ class NiuSmsService extends BaseAdminService if (empty($config) || $config['username'] != $username) { throw new AdminException('ACCOUNT_ERROR_RELOGIN'); } - $list = NoticeDict::getNoticeWithAddon($template_key,SmsDict::NIUSMS); + $list = NoticeDict::getNoticeWithAddon($template_key, SmsDict::NIUSMS); $list = $this->formatTemplateList($list); @@ -383,20 +385,35 @@ class NiuSmsService extends BaseAdminService ['site_id', '=', $this->site_id] ])->select()->toArray(); $report_list = array_column($report_list, null, 'template_key'); + foreach ($list as &$item) { $template_key = $item['key']; $report_info = $report_list[$template_key] ?? []; + $item['template_id'] = $report_info['template_id'] ?? 0; $item['template_type_name'] = !empty($report_info['template_type']) ? NoticeTypeDict::getTemplateType($report_info['template_type']) : ""; $item['sms_type'] = $report_info['sms_type'] ?? $sms_type; $item['site_id'] = $report_info['site_id'] ?? $this->site_id; $item['username'] = $report_info['username'] ?? $username; + $params_json = array_keys($report_info['param_json'] ?? []); + sort($params_json); + $variable = array_keys($item['variable'] ?? []); + sort($variable); + $audit_status = $report_info['audit_status'] ?? NoticeTypeDict::TEMPLATE_AUDIT_STATUS_NOT_REPORT; + if (!empty($report_info) && $variable != $params_json) { + $error_status = $audit_status == NoticeTypeDict::TEMPLATE_AUDIT_STATUS_PASS + ? NoticeTypeDict::TEMPLATE_AUDIT_STATUS_NEED_AGAIN_REPORT + : NoticeTypeDict::TEMPLATE_AUDIT_STATUS_NEED_EDIT; + } + $item['audit_info'] = [ 'audit_msg' => $report_info['audit_msg'] ?? '', 'audit_status' => $audit_status, 'audit_status_name' => NoticeTypeDict::getTemplateAuditStatus($audit_status), + 'error_status' => $error_status ?? '', + 'error_status_name' => !empty($error_status) ? NoticeTypeDict::getTemplateAuditStatus($error_status) : "" ]; } return $list; @@ -404,18 +421,35 @@ class NiuSmsService extends BaseAdminService public function checkTemplateAudit($template_key, $template_id) { - $config = $this->niu_service->getNiuLoginConfig(); + $config = $this->niu_service->getNiuLoginConfig(true); + //当前使用短信功能提供商非牛云短信无需校验模版ID是否正常 + if (isset($config['default']) && $config['default'] != SmsDict::NIUSMS) { + return true; + } + $config = $config[SmsDict::NIUSMS]; if (empty($config)) { - return false; + throw new AdminException('TEMPLATE_ERROR'); } $template_info = $this->template_model->where([ ['sms_type', '=', SmsDict::NIUSMS], ['template_id', '=', $template_id], ['username', '=', $config['username']], ['template_key', '=', $template_key], - ])->findOrEmpty(); + ])->findOrEmpty()->toArray(); + $params_json = array_keys($template_info['param_json'] ?? []); + sort($params_json); + + $template_config = $this->getTemplateList(SmsDict::NIUSMS, $config['username'], $template_key)[0]; + + $variable = array_keys($template_config['variable'] ?? []); + sort($variable); + + if (!empty($template_info) && $variable != $params_json) { + throw new AdminException('TEMPLATE_USE_ERROR'); + } + if (empty($template_info) || $template_info['audit_status'] != NoticeTypeDict::TEMPLATE_AUDIT_STATUS_PASS) { - return false; + throw new AdminException('TEMPLATE_ERROR'); } return $template_info; } @@ -437,7 +471,7 @@ class NiuSmsService extends BaseAdminService // $temp['addon'] = $addon; $temp['addon'] = $addon_list[$addon] ?? '系统'; $str = $temp['sms']['content'] ?? ""; - if (empty($str)){ + if (empty($str)) { continue; } preg_match_all('/\{(.*?)\}/', $str, $matches); @@ -505,21 +539,22 @@ class NiuSmsService extends BaseAdminService if (empty($template_info['sms']['content'])) { throw new AdminException('TEMPLATE_NOT_SMS_CONTENT'); } + $model_info = $this->template_model->where('template_key', $template_key)->findOrEmpty(); + if (!$model_info->isEmpty() && $model_info->audit_status == NoticeTypeDict::TEMPLATE_AUDIT_STATUS_PASS) { + throw new AdminException('TEMPLATE_IS_PASS'); + } $config = $this->niu_service->getNiuLoginConfig(); $data = [ 'temName' => $template_info['name'], 'temType' => $params['template_type'], 'temContent' => $template_info['sms']['content'], 'paramJson' => $params['params_json'], - 'extend' => json_encode(['template_key' => $template_key]), + 'extend' => ['template_key' => $template_key], 'signature' => $config['signature'], + 'temId' => $params['template_id'], ]; - if ($params['template_id']) { - $data['temId'] = $params['template_id']; - } $res = $this->niu_service->templateCreate($username, $data); $tem_id = $res['temId'] ?? 0; - $model_info = $this->template_model->where('template_key', $template_key)->findOrEmpty(); if ($model_info->isEmpty()) { $this->template_model->create([ 'site_id' => $this->site_id, @@ -542,6 +577,22 @@ class NiuSmsService extends BaseAdminService return $res ?? []; } + /** + * 清除模版报备信息 + * @param $username + * @param $template_id + * @return void + * @throws \Exception + */ + public function templateDelete($username, $template_id) + { + $config = $this->niu_service->getNiuLoginConfig(); + $params['password'] = $config['password']; + $params['template_id'] = $template_id; + $this->niu_service->templateDelete($username, $params); + $this->template_model->where('template_id', $template_id)->delete(); + } + /** * 格式化列表接口分页器 * @param $data diff --git a/niucloud/app/service/admin/notice/NoticeService.php b/niucloud/app/service/admin/notice/NoticeService.php index 7041a886b..8a2a17865 100644 --- a/niucloud/app/service/admin/notice/NoticeService.php +++ b/niucloud/app/service/admin/notice/NoticeService.php @@ -102,13 +102,7 @@ class NoticeService extends BaseAdminService break; } if ($type == NoticeTypeDict::SMS && $data['status'] == 1) { - $info = (new CoreConfigService())->getConfigValue($this->site_id, ConfigKeyDict::SMS); - if ($info['default'] == SmsDict::NIUSMS) { - $res = (new NiuSmsService())->checkTemplateAudit($data['key'], $data['sms_id']); - if (!$res) { - throw new AdminException('TEMPLATE_ERROR'); - } - } + (new NiuSmsService())->checkTemplateAudit($data['key'], $data['sms_id']); } return (new CoreNoticeService())->edit($this->site_id, $key, $save_data); } diff --git a/niucloud/app/service/admin/notice/SmsService.php b/niucloud/app/service/admin/notice/SmsService.php index 9b8cdf505..050dc65ed 100644 --- a/niucloud/app/service/admin/notice/SmsService.php +++ b/niucloud/app/service/admin/notice/SmsService.php @@ -134,7 +134,7 @@ class SmsService extends BaseAdminService $config[$sms_type][$k_param] = $value; } - return (new CoreConfigService())->setConfig($this->site_id, 'SMS', $config); + return (new CoreConfigService())->setConfig($this->site_id,ConfigKeyDict::SMS, $config); } diff --git a/niucloud/app/service/admin/schedule/ScheduleService.php b/niucloud/app/service/admin/schedule/ScheduleService.php index 6d677369a..891af2106 100644 --- a/niucloud/app/service/admin/schedule/ScheduleService.php +++ b/niucloud/app/service/admin/schedule/ScheduleService.php @@ -12,8 +12,10 @@ namespace app\service\admin\schedule; +use app\dict\schedule\ScheduleDict; use app\service\core\schedule\CoreScheduleService; use core\base\BaseAdminService; +use core\exception\AdminException; /** @@ -67,7 +69,11 @@ class ScheduleService extends BaseAdminService */ public function add(array $data) { - $res = (new CoreScheduleService())->add($data); + if (!empty($data['time'])) { + $this->checkTimeCycle($data['time']); + } + + (new CoreScheduleService())->add($data); return true; } @@ -80,10 +86,42 @@ class ScheduleService extends BaseAdminService */ public function edit(int $id, array $data) { + if (!empty($data['time'])) { + $this->checkTimeCycle($data['time']); + } (new CoreScheduleService())->edit($id, $data); return true; } + /** + * 校验任务时间配置 + * @param array $time + * @throws AdminException + */ + protected function checkTimeCycle(array $time) + { + $type = $time['type'] ?? null; + + // 配置要求字段 + $rules = [ + ScheduleDict::MIN => ['min'], + ScheduleDict::HOUR => ['hour', 'min'], + ScheduleDict::DAY => ['day', 'hour', 'min'], + ScheduleDict::WEEK => ['hour', 'min'], + ScheduleDict::MONTH => ['day', 'hour', 'min'], + ]; + + if (!isset($rules[$type])) { + throw new AdminException('TASK_CYCLE_ERROR'); + } + + foreach ($rules[$type] as $field) { + if (empty($time[$field])) { + throw new AdminException('TASK_CYCLE_ERROR'); + } + } + } + /** * 删除 * @param int $id @@ -111,4 +149,4 @@ class ScheduleService extends BaseAdminService { return (new CoreScheduleService())->doSchedule($id); } -} \ 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 623097798..1a2681cec 100644 --- a/niucloud/app/service/admin/site/SiteService.php +++ b/niucloud/app/service/admin/site/SiteService.php @@ -71,7 +71,7 @@ class SiteService extends BaseAdminService $item[ 'admin' ] = ( new SysUserRole() )->where([ [ 'site_id', '=', $item[ 'site_id' ] ], [ 'is_admin', '=', 1 ] ]) ->field('uid') ->with([ 'userinfo' ]) - ->find()->toArray(); + ->findOrempty()->toArray(); }); } @@ -108,6 +108,7 @@ class SiteService extends BaseAdminService $data[ 'app_type' ] = 'site'; //添加站点 $data_site = [ + 'site_domain' => $data[ 'site_domain' ] ?? '', 'site_name' => $data[ 'site_name' ], 'app_type' => $data[ 'app_type' ], 'group_id' => $data[ 'group_id' ], @@ -324,12 +325,18 @@ class SiteService extends BaseAdminService } if ($is_admin) { - return ( new MenuService() )->getAllMenuList($app_type, $status, $is_tree, $is_button); + //获取全部菜单列表 + $all_menu_list = ( new MenuService() )->getAllMenuList($app_type, $status, $is_tree, $is_button); + //根据parent_select_key字段重新整理上下级关系 并返回 + return ( new MenuService() )->moveChildrenToParent($all_menu_list); } else { $user_role_ids = $user_role_info[ 'role_ids' ]; $role_service = new RoleService(); $menu_keys = $role_service->getMenuIdsByRoleIds($this->site_id, $user_role_ids); - return ( new MenuService() )->getMenuListByMenuKeys($this->site_id, $menu_keys, $this->app_type, 1, is_button:$is_button); + //获取全部菜单列表 + $all_menu_list = ( new MenuService() )->getMenuListByMenuKeys($this->site_id, $menu_keys, $this->app_type, 1, is_button:$is_button); + //根据parent_select_key字段重新整理上下级关系 并返回 + return ( new MenuService() )->moveChildrenToParent($all_menu_list); } } @@ -463,4 +470,58 @@ class SiteService extends BaseAdminService return $list; } + + /** + * 查询营销列表 + * @return array + */ + public function getShowMarketingTools() + { + $list = [ + 'marketing' => [ + 'title' => '营销活动', + 'list' => [] + ] + ]; + + $apps = event('ShowMarketing'); + + + $keys = []; + foreach ($apps as $v) { + foreach ($v as $ck => $cv) { + if (!empty($cv)) { + foreach ($cv as $addon_k => $addon_v) { + if (in_array($addon_v[ 'key' ], $keys)) { + continue; + } + $list[ $ck ][ 'list' ][] = $addon_v; + $keys[] = $addon_v[ 'key' ]; + } + } + + } + } + + return $list; + } + + /** + * 站点初始化 + * @return bool + */ + public function siteInit($data) + { + $site_id = $data[ 'site_id' ]; + if (empty($site_id)) throw new AdminException('SITE_NOT_EXIST'); + + $site = $this->model->where([ [ 'site_id', '=', $site_id ] ])->with([ 'site_group' ])->findOrEmpty()->toArray(); + if (empty($site)) throw new AdminException('SITE_NOT_EXIST'); + + event('SiteInit', [ 'site_id' => $site_id, 'main_app' => $site[ 'site_group' ][ 'app' ], 'site_addons' => $site[ 'site_group' ][ 'addon' ] ]); + Cache::clear(); + return true; + } + + } diff --git a/niucloud/app/service/admin/site/SiteUserService.php b/niucloud/app/service/admin/site/SiteUserService.php index 0959e9aa1..f0313f542 100644 --- a/niucloud/app/service/admin/site/SiteUserService.php +++ b/niucloud/app/service/admin/site/SiteUserService.php @@ -15,7 +15,6 @@ use app\dict\sys\UserDict; use app\model\sys\SysRole; use app\model\sys\SysUser; use app\model\sys\SysUserRole; -use app\model\sys\UserCreateSiteLimit; use app\service\admin\auth\LoginService; use app\service\admin\user\UserRoleService; use app\service\admin\user\UserService; @@ -53,10 +52,10 @@ class SiteUserService extends BaseAdminService $condition = []; if (isset($where['username']) && $where['username'] !== '') $condition[] = ['username', 'like', "%{$this->model->handelSpecialCharacter($where['username'])}%"]; $query->where($condition); - })->where([ ['SysUserRole.site_id', '=', $this->site_id ]]); - return $this->pageQuery($search_model, function ($item){ + })->where([['SysUserRole.site_id', '=', $this->site_id]]); + return $this->pageQuery($search_model, function ($item) { if (!empty($item['role_ids'])) { - $item['role_array'] = (new SysRole())->where([ ['role_id', 'in', $item['role_ids'] ] ])->column('role_name'); + $item['role_array'] = (new SysRole())->where([['role_id', 'in', $item['role_ids']]])->column('role_name'); } else { $item['role_array'] = []; } @@ -70,7 +69,7 @@ class SiteUserService extends BaseAdminService */ public function getInfo(int $uid) { - $info = (new SysUserRole())->where([ ['uid', '=', $uid], ['site_id', '=', $this->site_id] ]) + $info = (new SysUserRole())->where([['uid', '=', $uid], ['site_id', '=', $this->site_id]]) ->with('userinfo')->append(['status_name']) ->findOrEmpty()->toArray(); return $info; @@ -104,7 +103,7 @@ class SiteUserService extends BaseAdminService Db::commit(); return true; - } catch ( Exception $e) { + } catch (Exception $e) { Db::rollback(); throw new AdminException($e->getMessage()); } @@ -152,9 +151,13 @@ class SiteUserService extends BaseAdminService * @param int $uid * @return bool|true */ - public function lock(int $uid){ - (new SysUserRole())->where([ ['uid', '=', $uid], ['site_id', '=', $this->site_id] ])->update(['status' => UserDict::OFF]); + public function lock(int $uid) + { + (new SysUser())->where([['uid', '=', $uid]])->update(['status' => UserDict::OFF]); + (new SysUserRole())->where([['uid', '=', $uid], ['site_id', '=', $this->site_id]])->update(['status' => UserDict::OFF]); Cache::delete('user_role_list_' . $uid); + $site_id = $this->request->defaultSiteId(); + Cache::delete('user_role_'.$uid.'_'.$site_id); LoginService::clearToken($uid); return true; } @@ -164,9 +167,13 @@ class SiteUserService extends BaseAdminService * @param int $uid * @return bool|true */ - public function unlock(int $uid){ - (new SysUserRole())->where([ ['uid', '=', $uid], ['site_id', '=', $this->site_id] ])->update(['status' => UserDict::ON]); + public function unlock(int $uid) + { + (new SysUser())->where([['uid', '=', $uid]])->update(['status' => UserDict::ON]); + (new SysUserRole())->where([['uid', '=', $uid], ['site_id', '=', $this->site_id]])->update(['status' => UserDict::ON]); Cache::delete('user_role_list_' . $uid); + $site_id = $this->request->defaultSiteId(); + Cache::delete('user_role_'.$uid.'_'.$site_id); LoginService::clearToken($uid); return true; } diff --git a/niucloud/app/service/admin/site/UserLogService.php b/niucloud/app/service/admin/site/UserLogService.php index d911c1a3e..276b63ca8 100644 --- a/niucloud/app/service/admin/site/UserLogService.php +++ b/niucloud/app/service/admin/site/UserLogService.php @@ -37,7 +37,7 @@ class UserLogService extends BaseAdminService */ public function getPage(array $where) { - $field = 'id, ip, site_id, uid, username, url, params, type, create_time'; + $field = 'id, ip, site_id, uid, username, operation, url, params, type, create_time'; $order = 'create_time desc'; $search_model = $this->model->where([['site_id', '=', $this->site_id]])->withSearch(['username', 'create_time', 'uid', 'ip', 'type', 'url'], $where)->field($field)->order($order); return $this->pageQuery($search_model); @@ -53,7 +53,7 @@ class UserLogService extends BaseAdminService ['id', '=', $id], ['site_id', '=', $this->site_id] ); - $field = 'id, ip, site_id, uid, username, url, params, type, create_time'; + $field = 'id, ip, site_id, uid, username, operation, url, params, type, create_time'; return $this->model->where($where)->field($field)->findOrEmpty()->toArray(); } diff --git a/niucloud/app/service/admin/stat/StatService.php b/niucloud/app/service/admin/stat/StatService.php index 3501b047d..dc2ff9355 100644 --- a/niucloud/app/service/admin/stat/StatService.php +++ b/niucloud/app/service/admin/stat/StatService.php @@ -129,7 +129,10 @@ class StatService extends BaseAdminService } } $app_count = ( new CoreAddonService() )->getLocalAddonCount(); - $app_installed_count = ( new CoreAddonService() )->getCount(); + $app_list = ( new CoreAddonService() )->getLocalAddonList()['list']??[]; + $app_keys = array_keys($app_list); + $app_installed_count = ( new CoreAddonService() )->getCount([['key','in',$app_keys]]); + $app = [ 'app_count' => $app_count, 'app_no_installed_count' => $app_count - $app_installed_count, diff --git a/niucloud/app/service/admin/sys/AttachmentService.php b/niucloud/app/service/admin/sys/AttachmentService.php index dbe277f97..6fb96826b 100644 --- a/niucloud/app/service/admin/sys/AttachmentService.php +++ b/niucloud/app/service/admin/sys/AttachmentService.php @@ -249,77 +249,4 @@ class AttachmentService extends BaseAdminService 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 (isset($data[ 'name' ]) && $data[ 'name' ] != '' && !str_contains($v[ 'name' ], $data[ 'name' ])) { - unset($icon_list[ $k ]); - } - } - return array_values($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 $v) { - - $icon = $v[ 'glyphs' ]; // 图标列表 - - foreach ($icon as $ck => $cv) { - // 素材表中数据保持要一致 - $icon[ $ck ][ 'att_id' ] = $cv[ 'icon_id' ]; - $icon[ $ck ][ 'url' ] = $v[ 'font_family' ] . ' ' . $v[ 'css_prefix_text' ] . $cv[ 'font_class' ]; - $icon[ $ck ][ 'real_name' ] = $cv[ 'name' ]; - - // 查询名称 - if (!empty($data[ 'real_name' ]) && !str_contains($cv[ 'name' ], $data[ 'real_name' ])) { - 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/MenuService.php b/niucloud/app/service/admin/sys/MenuService.php index 5e19243ce..f4fea6eaf 100644 --- a/niucloud/app/service/admin/sys/MenuService.php +++ b/niucloud/app/service/admin/sys/MenuService.php @@ -238,6 +238,80 @@ class MenuService extends BaseAdminService return $is_tree ? $this->menuToTree($menu_list, 'menu_key', 'parent_key', 'children', 'auth', '', $is_button) : $menu_list; } + /** + * 根据parent_select_key字段重新整理上下级关系 + * @param array $menus + * @return mixed + * @throws DataNotFoundException + * @throws DbException + * @throws ModelNotFoundException + */ + public function moveChildrenToParent(array &$menus) { + $menuKeyMap = []; + //处理整个菜单结构，建立menu_key映射 + $flattenMenus = function (&$list) use (&$flattenMenus, &$menuKeyMap) { + foreach ($list as &$item) { + if (!empty($item[ 'menu_key' ])) { + $menuKeyMap[$item[ 'menu_key' ]] = &$item; + } + if (isset($item[ 'children' ]) && is_array($item[ 'children' ])) { + $flattenMenus($item[ 'children' ]); + } + } + }; + $flattenMenus($menus); + + //重新分配parent_select_key子项 + $moveList = []; + $collectMoves = function (&$list, $parentList = null) use (&$collectMoves, &$moveList) { + foreach ($list as $i => &$item) { + if (!empty($item[ 'parent_select_key' ])) { + $moveList[] = [ + 'item' => &$item, + 'parent_list' => &$list, + 'index' => $i, + 'target_key' => $item['parent_select_key'], + ]; + } + if (isset($item[ 'children' ]) && is_array($item[ 'children' ])) { + $collectMoves($item[ 'children' ], $item); + } + } + }; + $collectMoves($menus); + + //迁移 + foreach ($moveList as $move) { + $item = $move[ 'item' ]; + $targetKey = $move[ 'target_key' ]; + $index = $move[ 'index' ]; + $parentList = &$move[ 'parent_list' ]; + // 从当前children列表中移除 + unset($parentList[ $index ]); + + // 将其添加到目标key的children + if (isset($menuKeyMap[ $targetKey ])) { + if (!isset($menuKeyMap[ $targetKey ][ 'children' ]) || !is_array($menuKeyMap[ $targetKey ][ 'children' ])) { + $menuKeyMap[ $targetKey ][ 'children' ] = []; + } + $menuKeyMap[ $targetKey ][ 'children' ][] = $item; + } + } + + //清理index，避免因unset导致的乱序 + $reIndex = function (&$list) use (&$reIndex) { + $list = array_values($list); + foreach ($list as $key=> &$item) { + if (isset($item[ 'children' ]) && is_array($item[ 'children' ])) { + $reIndex($item[ 'children' ]); + } + } + + }; + $reIndex($menus); + return $menus; + } + /** * 通过菜单menu_key组获取接口数组 @@ -585,7 +659,8 @@ class MenuService extends BaseAdminService $v[ 'menu_name' ] = $lang_menu_name; } } - return $is_tree ? $this->menuToTree($menu_list, 'menu_key', 'parent_key', 'children', 'auth', '', $is_button) : $menu_list; + $all_menu_list = $is_tree ? $this->menuToTree($menu_list, 'menu_key', 'parent_key', 'children', 'auth', '', $is_button) : $menu_list; + return $this->moveChildrenToParent($all_menu_list); } public function getAddonMenu($app_key, $status = 'all', $is_tree = 0, $is_button = 0) diff --git a/niucloud/app/service/admin/sys/RoleService.php b/niucloud/app/service/admin/sys/RoleService.php index a376cd120..364359b93 100644 --- a/niucloud/app/service/admin/sys/RoleService.php +++ b/niucloud/app/service/admin/sys/RoleService.php @@ -135,6 +135,19 @@ class RoleService extends BaseAdminService } + /** + * 修改状态 + * @param $data + * @return Label + */ + public function modifyStatus($data) + { + return $this->model->where([ + [ 'role_id', '=', $data[ 'role_id' ] ], + [ 'site_id', '=', $this->site_id ] + ])->update([ 'status' => $data[ 'status' ] ]); + } + /** * 获取模型对象 * @param int $site_id diff --git a/niucloud/app/service/admin/upgrade/BackupRecordsService.php b/niucloud/app/service/admin/upgrade/BackupRecordsService.php index e41a701f9..70584bf4d 100644 --- a/niucloud/app/service/admin/upgrade/BackupRecordsService.php +++ b/niucloud/app/service/admin/upgrade/BackupRecordsService.php @@ -178,6 +178,7 @@ class BackupRecordsService extends BaseAdminService public function checkPermission() { $niucloud_dir = $this->root_path . 'niucloud' . DIRECTORY_SEPARATOR; + $upgrade_dir = $this->root_path . 'upgrade' . DIRECTORY_SEPARATOR; $admin_dir = $this->root_path . 'admin' . DIRECTORY_SEPARATOR; $web_dir = $this->root_path . 'web' . DIRECTORY_SEPARATOR; $wap_dir = $this->root_path . 'uni-app' . DIRECTORY_SEPARATOR; @@ -197,11 +198,13 @@ class BackupRecordsService extends BaseAdminService ]; $data[ 'dir' ][ 'is_readable' ][] = [ 'dir' => str_replace(project_path(), '', $niucloud_dir), 'status' => is_readable($niucloud_dir) ]; + $data[ 'dir' ][ 'is_readable' ][] = [ 'dir' => str_replace(project_path(), '', $upgrade_dir), 'status' => is_readable($upgrade_dir) ]; $data[ 'dir' ][ 'is_readable' ][] = [ 'dir' => str_replace(project_path(), '', $admin_dir), 'status' => is_readable($admin_dir) ]; $data[ 'dir' ][ 'is_readable' ][] = [ 'dir' => str_replace(project_path(), '', $web_dir), 'status' => is_readable($web_dir) ]; $data[ 'dir' ][ 'is_readable' ][] = [ 'dir' => str_replace(project_path(), '', $wap_dir), 'status' => is_readable($wap_dir) ]; $data[ 'dir' ][ 'is_write' ][] = [ 'dir' => str_replace(project_path(), '', $niucloud_dir), 'status' => is_write($niucloud_dir) ]; + $data[ 'dir' ][ 'is_write' ][] = [ 'dir' => str_replace(project_path(), '', $upgrade_dir), 'status' => is_write($upgrade_dir) ]; $data[ 'dir' ][ 'is_write' ][] = [ 'dir' => str_replace(project_path(), '', $admin_dir), 'status' => is_write($admin_dir) ]; $data[ 'dir' ][ 'is_write' ][] = [ 'dir' => str_replace(project_path(), '', $web_dir), 'status' => is_write($web_dir) ]; $data[ 'dir' ][ 'is_write' ][] = [ 'dir' => str_replace(project_path(), '', $wap_dir), 'status' => is_write($wap_dir) ]; @@ -343,7 +346,7 @@ class BackupRecordsService extends BaseAdminService 'task' => 'backupSql' ]; if ($backup_result % 5 == 0) { - $res[ 'data' ][ 'content' ] = $backup_result == 0 ? '数据库开始备份' : '数据库备份中已备份'. $backup_result . '%'; + $res[ 'data' ][ 'content' ] = $backup_result == 0 ? '数据库开始备份' : '数据库备份中已备份' . $backup_result . '%'; } } @@ -382,7 +385,7 @@ class BackupRecordsService extends BaseAdminService ]; $restore_progress = $db->getRestoreProgress(); if ($restore_progress % 5 == 0) { - $res[ 'data' ]['content'] = $restore_progress == 0 ? '数据库开始恢复' : '数据库恢复中已恢复'. $restore_progress . '%'; + $res[ 'data' ][ 'content' ] = $restore_progress == 0 ? '数据库开始恢复' : '数据库恢复中已恢复' . $restore_progress . '%'; } } @@ -515,7 +518,7 @@ class BackupRecordsService extends BaseAdminService ]; } else { $res[ 'data' ] = [ - 'content' => $backup_result == 0 ? '数据库开始备份' : '数据库备份已备份'. $backup_result . '%', + 'content' => $backup_result == 0 ? '数据库开始备份' : '数据库备份已备份' . $backup_result . '%', 'task' => 'backupSql' ]; } diff --git a/niucloud/app/service/admin/upgrade/BackupService.php b/niucloud/app/service/admin/upgrade/BackupService.php index 8129cfe9a..152a2aaef 100644 --- a/niucloud/app/service/admin/upgrade/BackupService.php +++ b/niucloud/app/service/admin/upgrade/BackupService.php @@ -11,8 +11,6 @@ namespace app\service\admin\upgrade; -use core\util\DbBackup; -use think\facade\Db; /** * 框架及插件升级备份 diff --git a/niucloud/app/service/admin/upgrade/UpgradeService.php b/niucloud/app/service/admin/upgrade/UpgradeService.php index 1ba742caf..999874f3c 100644 --- a/niucloud/app/service/admin/upgrade/UpgradeService.php +++ b/niucloud/app/service/admin/upgrade/UpgradeService.php @@ -186,6 +186,17 @@ class UpgradeService extends BaseAdminService $upgrade_content = $this->getUpgradeContent($addon); if (empty($upgrade_content['content'])) throw new CommonException("NOT_EXIST_UPGRADE_CONTENT"); + // 过滤掉没有更新版本的插件 + $upgrade_content['content'] = array_values(array_filter(array_map(function ($item){ + if (!empty($item['version_list'])) return $item; + }, $upgrade_content['content']))); + if (empty($upgrade_content['content'])) throw new CommonException("NOT_EXIST_UPGRADE_CONTENT"); + + $upgrade_content['upgrade_apps'] = []; + foreach ($upgrade_content['content'] as $item) { + $upgrade_content['upgrade_apps'][] = $item['app']['app_key']; + } + $upgrade_title = '框架'; $upgrade = [ @@ -766,7 +777,7 @@ class UpgradeService extends BaseAdminService */ public function restoreCode() { - if ($this->upgrade_task['is_need_backup']) { + if (!isset($this->upgrade_task['is_need_backup']) || $this->upgrade_task['is_need_backup']) { $backup_dir = $this->upgrade_dir . $this->upgrade_task[ 'key' ] . DIRECTORY_SEPARATOR . 'backup' . DIRECTORY_SEPARATOR . 'code' . DIRECTORY_SEPARATOR; } else { $backup_dir = $this->upgrade_dir . $this->upgrade_task['upgrade_content']['last_backup'][ 'key' ] . DIRECTORY_SEPARATOR . 'backup' . DIRECTORY_SEPARATOR . 'code' . DIRECTORY_SEPARATOR; @@ -789,7 +800,7 @@ class UpgradeService extends BaseAdminService */ public function restoreSql($index = 0) { - if ($this->upgrade_task['is_need_backup']) { + if (!isset($this->upgrade_task['is_need_backup']) || $this->upgrade_task['is_need_backup']) { $backup_dir = $this->upgrade_dir . $this->upgrade_task[ 'key' ] . DIRECTORY_SEPARATOR . 'backup' . DIRECTORY_SEPARATOR . 'sql' . DIRECTORY_SEPARATOR; } else { $backup_dir = $this->upgrade_dir . $this->upgrade_task['upgrade_content']['last_backup'][ 'key' ] . DIRECTORY_SEPARATOR . 'backup' . DIRECTORY_SEPARATOR . 'sql' . DIRECTORY_SEPARATOR; diff --git a/niucloud/app/service/admin/user/UserService.php b/niucloud/app/service/admin/user/UserService.php index 98493dacc..be875f4b7 100644 --- a/niucloud/app/service/admin/user/UserService.php +++ b/niucloud/app/service/admin/user/UserService.php @@ -12,9 +12,7 @@ namespace app\service\admin\user; -use app\dict\sys\AppTypeDict; use app\dict\sys\UserDict; -use app\model\sys\SysRole; use app\model\sys\SysUser; use app\model\sys\SysUserRole; use app\model\sys\UserCreateSiteLimit; diff --git a/niucloud/app/service/api/diy_form/DiyFormService.php b/niucloud/app/service/api/diy_form/DiyFormService.php index 4a2f39c1b..0c772210d 100644 --- a/niucloud/app/service/api/diy_form/DiyFormService.php +++ b/niucloud/app/service/api/diy_form/DiyFormService.php @@ -18,6 +18,7 @@ use app\model\member\Member; use app\model\member\MemberLabel; use app\model\member\MemberLevel; use app\service\core\diy_form\CoreDiyFormRecordsService; +use app\service\core\member\CoreMemberConfigService; use core\base\BaseApiService; use core\exception\ApiException; @@ -285,6 +286,46 @@ class DiyFormService extends BaseApiService return ( new CoreDiyFormRecordsService() )->add($data); } + /** + * 编辑填表记录 + * @param array $data + * @return array + */ + public function editRecord(array $data = []) + { + $diy_form_records_model = new DiyFormRecords(); + $records_info = $diy_form_records_model->field('form_id')->where([['record_id', '=', $data['record_id']], ['member_id', '=', $this->member_id]])->findOrEmpty()->toArray(); + if (empty($records_info)) throw new ApiException('DIY_FORM_RECORDS_NOT_EXIST'); + + $data[ 'form_id' ] = $records_info[ 'form_id' ]; + $data[ 'member_id' ] = $this->member_id; + $data[ 'site_id' ] = $this->site_id; + + $info = $this->model->field('status')->where([ [ 'form_id', '=', $records_info[ 'form_id' ] ] ])->findOrEmpty()->toArray(); + if (empty($info)) throw new ApiException('DIY_FORM_NOT_EXIST'); + if ($info[ 'status' ] == 0) throw new ApiException('DIY_FORM_NOT_OPEN'); + + $core_diy_form_records_service = new CoreDiyFormRecordsService(); + $write_config = ( new DiyFormWriteConfig() )->where([ + [ 'form_id', '=', $records_info[ 'form_id' ] ] + ])->findOrEmpty()->toArray(); + if (!empty($write_config)) { + if ($error_msg = $this->checkMemberCanJoinOrNot($this->member_id, $write_config)) { + throw new ApiException($error_msg[ 'desc' ]); + } + if ($error_msg = $this->checkFormWriteTime($write_config)) { + throw new ApiException($error_msg[ 'desc' ]); + } + if ($error_msg = $this->checkFormWriteLimitNum($records_info[ 'form_id' ], $write_config)) { + throw new ApiException($error_msg[ 'desc' ]); + } + if ($error_msg = $this->checkMemberWriteLimitNum($this->member_id, $records_info[ 'form_id' ], $write_config)) { + throw new ApiException($error_msg[ 'desc' ]); + } + } + return $core_diy_form_records_service->edit($data); + } + /** * 获取表单填写结果信息 * @param array $params @@ -317,4 +358,43 @@ class DiyFormService extends BaseApiService return $info; } + /** + * 获取个人资料表单填写记录 + * @param array $params + * @return mixed + */ + public function getMemberInfoFormRecordInfo() + { + $info = []; + $config = (new CoreMemberConfigService())->getMemberConfig($this->site_id); + if (!empty($config['form_id'])) { + $diy_form_records_model = new DiyFormRecords(); + $field = 'record_id,form_id,create_time'; + $records_info = $diy_form_records_model->field($field)->where([['form_id', '=', $config['form_id']], ['member_id', '=', $this->member_id]])->with([ + // 关联填写字段列表 + 'recordsFieldList' => function($query) { + $query->field('id, form_id, form_field_id, record_id, field_key, field_type, field_name, field_value, field_required, field_unique, privacy_protection, update_num, update_time')->append([ 'handle_field_value', 'render_value' ]); + } + ])->order('create_time desc')->findOrEmpty()->toArray(); + + $form_info = $this->model->where([['form_id', '=', $config['form_id']], ['status', '=', 1]])->field('form_id,type') + ->with(['formField' => function($query) { + $query->field('form_id,field_id as form_field_id,field_key,field_type,field_name,field_default as field_value,field_required,field_unique,privacy_protection'); + }])->append([ 'type_name' ])->findOrEmpty()->toArray(); + + if (!empty($form_info)) { + if (!empty($records_info)) { + $records_info['recordsFieldList'] = array_column($records_info['recordsFieldList'], null, 'field_key'); + foreach ($form_info['formField'] as $k => &$v) { + if (!empty($records_info['recordsFieldList'][$v['field_key']])) { + $v['field_value'] = $records_info['recordsFieldList'][$v['field_key']]['field_value']; + } + } + } + $info = $form_info; + } + } + return $info; + } + } diff --git a/niucloud/app/service/api/member/MemberService.php b/niucloud/app/service/api/member/MemberService.php index b92f2cb22..db284ee57 100644 --- a/niucloud/app/service/api/member/MemberService.php +++ b/niucloud/app/service/api/member/MemberService.php @@ -11,7 +11,9 @@ namespace app\service\api\member; +use app\model\diy_form\DiyFormRecords; use app\model\member\Member; +use app\service\core\member\CoreMemberConfigService; use app\service\core\member\CoreMemberService; use core\base\BaseApiService; use core\exception\ApiException; @@ -60,7 +62,20 @@ class MemberService extends BaseApiService public function getInfo() { $field = 'member_id, site_id, username, member_no, mobile, register_channel, nickname, headimg, member_level, member_label, login_ip, login_type, login_time, create_time, last_visit_time, last_consum_time, sex, status, birthday, point, balance, growth, is_member, member_time, is_del, province_id, city_id, district_id, address, location, money, money_get, wx_openid, weapp_openid, commission, commission_get, commission_cash_outing'; - return $this->model->where([['member_id', '=', $this->member_id]])->with(['member_level_name_bind'])->field($field)->append(['sex_name'])->findOrEmpty()->toArray(); + $member_info = $this->model->where([['member_id', '=', $this->member_id]])->with(['member_level_name_bind'])->field($field)->append(['sex_name'])->findOrEmpty()->toArray(); + if (!empty($member_info)) { + $config = (new CoreMemberConfigService())->getMemberConfig($this->site_id); + $member_info['form_id'] = $config['form_id']; + $member_info['form_record_id'] = ''; + if (!empty($member_info['form_id'])) { + $diy_form_records_model = new DiyFormRecords(); + $form_records = $diy_form_records_model->field('record_id')->where([['form_id', '=', $member_info['form_id']], ['member_id', '=', $member_info['member_id']]])->order('create_time desc')->findOrEmpty()->toArray(); + if (!empty($form_records)) { + $member_info['form_record_id'] = $form_records['record_id']; + } + } + } + return $member_info; } /** diff --git a/niucloud/app/service/core/addon/CoreAddonDevelopBuildService.php b/niucloud/app/service/core/addon/CoreAddonDevelopBuildService.php index ad2fc3a55..57b140d10 100644 --- a/niucloud/app/service/core/addon/CoreAddonDevelopBuildService.php +++ b/niucloud/app/service/core/addon/CoreAddonDevelopBuildService.php @@ -89,7 +89,7 @@ class CoreAddonDevelopBuildService extends BaseCoreService */ public function menu(string $app_type) { $where = [ ['app_type', '=', $app_type], ['addon', '=', $this->addon] ]; - $field = 'menu_name,menu_key,menu_short_name,parent_key,menu_type,icon,api_url,router_path,view_path,methods,sort,status,is_show'; + $field = 'menu_name,menu_key,menu_short_name,parent_select_key,parent_key,menu_type,icon,api_url,router_path,view_path,methods,sort,status,is_show'; $menu = (new SysMenu())->where($where)->field($field)->order('sort', 'desc')->select()->toArray(); if (!empty($menu)) { $menu = $this->menuToTree($menu, 'menu_key', 'parent_key', 'children'); diff --git a/niucloud/app/service/core/addon/WapTrait.php b/niucloud/app/service/core/addon/WapTrait.php index 96db5254c..fbe03180d 100644 --- a/niucloud/app/service/core/addon/WapTrait.php +++ b/niucloud/app/service/core/addon/WapTrait.php @@ -33,6 +33,7 @@ trait WapTrait $content = "