mirage
/
edu
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://gitee.com/likeadmin/likeadmin_java into develop

This commit is contained in:
damonyuan 2024-11-16 15:36:55 +08:00
parent d96bf51bfc 30c7742118
commit a36f2460bb
43 changed files with 53 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
admin/src/utils/request/index.ts
View File

@ -35,7 +35,7 @@ const axiosHooks: AxiosHooks = {
config.params = {}
}
config.headers = headers
config.url = config.url?.replace(".", "/")
// config.url = config.url?.replace(".", "/")
return config
},
requestInterceptorsCatchHook(err) {

4
admin/src/views/channel/wx_oa/menu.vue
View File

@ -31,10 +31,10 @@ getOaMenuFunc()
</el-card>
<footer-btns>
<el-button type="primary" @click="handleSave" v-perms="['channel:oaMenu:save']">
<el-button type="primary" @click="handleSave" v-perms="['channel.official_account_menu/save']">
保存
</el-button>
<el-button type="primary" @click="handlePublish" v-perms="['channel:oaMenu:publish']">
<el-button type="primary" @click="handlePublish" v-perms="['channel.official_account_menu/saveAndPublish']">
发布
</el-button>
</footer-btns>

2
admin/src/views/decoration/pages/index.vue
View File

@ -23,7 +23,7 @@
@update:content="updateContent"
/>
</div>
<footer-btns class="mt-4" :fixed="false" v-perms="['decorate:pages:save']">
<footer-btns class="mt-4" :fixed="false" v-perms="['decorate.page/save']">
<el-button type="primary" @click="setData">保存</el-button>
</footer-btns>
</div>

2
admin/src/views/decoration/pc_details.vue
View File

@ -11,7 +11,7 @@
>
返回
</el-button>
<el-button v-perms="['decorate:pages:save']" @click="setData"> 保存 </el-button>
<el-button v-perms="['decorate.page/save']" @click="setData"> 保存 </el-button>
</div>
</el-card>
<div class="flex-1 h-full">

2
admin/src/views/decoration/tabbar.vue
View File

@ -34,7 +34,7 @@
</div>
</div>
<footer-btns :fixed="true" v-perms="['decorate:tabbar:save']">
<footer-btns :fixed="true" v-perms="['decorate.tabbar/save']">
<el-button type="primary" @click="setData">保存</el-button>
</footer-btns>
</div>

7
server/like-admin/src/main/java/com/mdd/admin/LikeAdminInterceptor.java
View File

@ -73,7 +73,8 @@ public class LikeAdminInterceptor implements HandlerInterceptor {
if (StringUtils.isNotNull(env) && env.equals("true")) {
String prefix = "/adminapi/";
String route = request.getRequestURI().replaceFirst(prefix, "");
String auths = route.replace("/", ":");
// String auths = route.replace("/", ":");
String auths = route;
List<String> ignoreUrl = Arrays.asList("system:login", "system:logout");
if (request.getMethod().equals("POST") && !ignoreUrl.contains(auths)) {
String message = "演示环境不支持修改数据，请下载源码本地部署体验";
@ -208,8 +209,8 @@ public class LikeAdminInterceptor implements HandlerInterceptor {
// 路由转权限
String prefix = "/adminapi/";
String route = uri.replaceFirst(prefix, "");
String auths = route.replace("/", ":");
// String auths = route.replace("/", ":");
String auths = route;
// 校验权限
StpUtil.checkPermission(auths);
}

3
server/like-admin/src/main/java/com/mdd/admin/config/stp/StpInterConfig.java
View File

@ -68,7 +68,8 @@ public class StpInterConfig implements StpInterface {
for (SystemMenu item : systemAuthMenus) {
if (StringUtils.isNotNull(item.getPerms()) && StringUtils.isNotEmpty(item.getPerms())) {
perms.add(item.getPerms().trim().replace("/", ":"));
// perms.add(item.getPerms().trim().replace("/", ":"));
perms.add(item.getPerms().trim());
}
}

2
server/like-admin/src/main/java/com/mdd/admin/controller/ArtCateController.java
View File

@ -21,7 +21,7 @@ import javax.annotation.Resource;
import java.util.List;
@RestController
@RequestMapping("/adminapi/article/articleCate")
@RequestMapping({"/adminapi/article/articleCate", "/adminapi/article.articleCate"})
@Api(tags = "文章分类管理")
public class ArtCateController {

2
server/like-admin/src/main/java/com/mdd/admin/controller/ArticleController.java
View File

@ -21,7 +21,7 @@ import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@RestController
@RequestMapping("adminapi/article/article")
@RequestMapping({"adminapi/article/article", "adminapi/article.article"})
@Api(tags = "文章数据管理")
public class ArticleController {

2
server/like-admin/src/main/java/com/mdd/admin/controller/CrontabController.java
View File

@ -24,7 +24,7 @@ import java.text.SimpleDateFormat;
import java.util.*;
@RestController
@RequestMapping("/adminapi/crontab/crontab")
@RequestMapping("/adminapi/crontab.crontab")
@Api(tags = "计划任务管理")
public class CrontabController {

2
server/like-admin/src/main/java/com/mdd/admin/controller/adminapi/auth/AdminController.java
View File

@ -21,7 +21,7 @@ import java.util.Map;
@Slf4j
@RestController
@RequestMapping("adminapi/auth/admin")
@RequestMapping({"adminapi/auth/admin", "adminapi/auth.admin"})
@Api(tags = "管理员详情管理")
public class AdminController {

2
server/like-admin/src/main/java/com/mdd/admin/controller/channel/ChannelH5Controller.java
View File

@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@RestController
@RequestMapping("/adminapi/channel/web_page_setting")
@RequestMapping("/adminapi/channel.web_page_setting")
@Api(tags = "移动渠道设置")
public class ChannelH5Controller {

2
server/like-admin/src/main/java/com/mdd/admin/controller/channel/ChannelMpController.java
View File

@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@RestController
@RequestMapping("/adminapi/channel/mnp_settings")
@RequestMapping("/adminapi/channel.mnp_settings")
@Api(tags = "微信程序渠道")
public class ChannelMpController {

2
server/like-admin/src/main/java/com/mdd/admin/controller/channel/ChannelOaController.java
View File

@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@RestController
@RequestMapping("/adminapi/channel/official_account_setting")
@RequestMapping("/adminapi/channel.official_account_setting")
@Api(tags = "公众号渠道设置")
public class ChannelOaController {

2
server/like-admin/src/main/java/com/mdd/admin/controller/channel/ChannelOaMenuController.java
View File

@ -11,7 +11,7 @@ import javax.annotation.Resource;
import java.util.List;
@RestController
@RequestMapping("/adminapi/channel/official_account_menu")
@RequestMapping("/adminapi/channel.official_account_menu")
@Api(tags = "公众号菜单管理")
public class ChannelOaMenuController {

2
server/like-admin/src/main/java/com/mdd/admin/controller/channel/ChannelOaReplyController.java
View File

@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@RestController
@RequestMapping("/adminapi/channel/official_account_reply")
@RequestMapping("/adminapi/channel.official_account_reply")
@Api(tags = "公众号回复")
public class ChannelOaReplyController {

2
server/like-admin/src/main/java/com/mdd/admin/controller/channel/ChannelOpController.java
View File

@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@RestController
@RequestMapping("/adminapi/channel/open_setting/")
@RequestMapping("/adminapi/channel.open_setting/")
@Api(tags = "微信开放渠道")
public class ChannelOpController {

2
server/like-admin/src/main/java/com/mdd/admin/controller/decorate/DecorateDataController.java
View File

@ -16,7 +16,7 @@ import javax.annotation.Resource;
import java.util.List;
@RestController
@RequestMapping("/adminapi/decorate/data")
@RequestMapping("/adminapi/decorate.data")
@Api(tags = "装修数据管理")
public class DecorateDataController {

2
server/like-admin/src/main/java/com/mdd/admin/controller/decorate/DecoratePagesController.java
View File

@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@RestController
@RequestMapping("/adminapi/decorate/page")
@RequestMapping("/adminapi/decorate.page")
@Api(tags = "装修页面管理")
public class DecoratePagesController {

2
server/like-admin/src/main/java/com/mdd/admin/controller/decorate/DecorateTabbarController.java
View File

@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@RestController
@RequestMapping("/adminapi/decorate/tabbar")
@RequestMapping("/adminapi/decorate.tabbar")
@Api(tags = "装修导航管理")
public class DecorateTabbarController {

2
server/like-admin/src/main/java/com/mdd/admin/controller/finance/FinanceRechargerController.java
View File

@ -21,7 +21,7 @@ import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@RestController
@RequestMapping("/adminapi/recharge/recharge")
@RequestMapping({"/adminapi/recharge/recharge", "/adminapi/recharge.recharge"})
@Api("充值记录管理")
public class FinanceRechargerController {

4
server/like-admin/src/main/java/com/mdd/admin/controller/finance/FinanceRefundController.java
View File

@ -5,6 +5,7 @@ import com.mdd.admin.validate.commons.PageValidate;
import com.mdd.admin.validate.finance.FinanceRefundSearchValidate;
import com.mdd.admin.vo.finance.FinanceRefundListVo;
import com.mdd.admin.vo.finance.FinanceRefundLogVo;
import com.mdd.common.aop.NotPower;
import com.mdd.common.core.AjaxResult;
import com.mdd.common.core.PageResult;
import com.mdd.common.validator.annotation.IDMust;
@ -20,13 +21,14 @@ import javax.annotation.Resource;
import java.util.List;
@RestController
@RequestMapping("/adminapi/finance/refund")
@RequestMapping("/adminapi/finance.refund")
@Api("退款记录管理")
public class FinanceRefundController {
@Resource
IFinanceRefundService iFinanceRefundService;
@NotPower
@GetMapping("/stat")
@ApiOperation("退还统计")
public AjaxResult<Object> stat() {

4
server/like-admin/src/main/java/com/mdd/admin/controller/finance/FinanceWalletController.java
View File

@ -4,6 +4,7 @@ import com.mdd.admin.service.IFinanceWalletService;
import com.mdd.admin.validate.commons.PageValidate;
import com.mdd.admin.validate.finance.FinanceWalletSearchValidate;
import com.mdd.admin.vo.finance.FinanceWalletListVo;
import com.mdd.common.aop.NotPower;
import com.mdd.common.core.AjaxResult;
import com.mdd.common.core.PageResult;
import io.swagger.annotations.Api;
@ -17,7 +18,7 @@ import javax.annotation.Resource;
import java.util.Map;
@RestController
@RequestMapping("/adminapi/finance/account_log")
@RequestMapping("/adminapi/finance.account_log")
@Api("余额明细管理")
public class FinanceWalletController {
@ -33,6 +34,7 @@ public class FinanceWalletController {
}
@NotPower
@GetMapping("/getUmChangeType")
@ApiOperation("记录列表")
public AjaxResult<Map<Integer, String>> getUmChangeType() {

2
server/like-admin/src/main/java/com/mdd/admin/controller/marketing/MarketingRechargeController.java
View File

@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@RestController
@RequestMapping("adminapi/recharge/recharge")
@RequestMapping({"adminapi/recharge/recharge", "adminapi/recharge.recharge"})
@Api("营销充值管理")
public class MarketingRechargeController {

2
server/like-admin/src/main/java/com/mdd/admin/controller/monitor/MonitorServerController.java
View File

@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.RestController;
import java.util.Map;
@RestController
@RequestMapping("adminapi/setting/system.system")
@RequestMapping("adminapi/setting.system.system")
@Api(tags = "监控服务管理")
public class MonitorServerController {

2
server/like-admin/src/main/java/com/mdd/admin/controller/setting/SettingDictDataController.java
View File

@ -24,7 +24,7 @@ import java.util.List;
import java.util.Map;
@RestController
@RequestMapping("/adminapi/setting/dict.dict_data")
@RequestMapping("/adminapi/setting.dict.dict_data")
@Api(tags = "配置字典数据")
public class SettingDictDataController {

2
server/like-admin/src/main/java/com/mdd/admin/controller/setting/SettingDictTypeController.java
View File

@ -22,7 +22,7 @@ import java.util.List;
import java.util.Map;
@RestController
@RequestMapping("/adminapi/setting/dict.dict_type")
@RequestMapping("/adminapi/setting.dict.dict_type")
@Api(tags = "配置字典类型")
public class SettingDictTypeController {

2
server/like-admin/src/main/java/com/mdd/admin/controller/setting/SettingLoginController.java
View File

@ -14,7 +14,7 @@ import javax.annotation.Resource;
import java.util.Map;
@RestController
@RequestMapping("/adminapi/setting/user.user")
@RequestMapping("/adminapi/setting.user.user")
@Api(tags = "配置用户登录")
public class SettingLoginController {

2
server/like-admin/src/main/java/com/mdd/admin/controller/setting/SettingNoticeController.java
View File

@ -17,7 +17,7 @@ import java.util.List;
import java.util.Map;
@RestController
@RequestMapping("/adminapi/notice/notice")
@RequestMapping("/adminapi/notice.notice")
@Api(tags = "配置消息通知")
public class SettingNoticeController {

2
server/like-admin/src/main/java/com/mdd/admin/controller/setting/SettingPayConfigController.java
View File

@ -17,7 +17,7 @@ import javax.annotation.Resource;
import java.util.List;
@RestController
@RequestMapping("/adminapi/setting/pay.pay_config")
@RequestMapping("/adminapi/setting.pay.pay_config")
@Api(tags = "配置支付参数")
public class SettingPayConfigController {

2
server/like-admin/src/main/java/com/mdd/admin/controller/setting/SettingPayWayController.java
View File

@ -19,7 +19,7 @@ import java.util.HashMap;
import java.util.List;
@RestController
@RequestMapping("/adminapi/setting/pay.pay_way")
@RequestMapping("/adminapi/setting.pay.pay_way")
@Api(tags = "配置支付参数")
public class SettingPayWayController {

2
server/like-admin/src/main/java/com/mdd/admin/controller/setting/SettingSearchController.java
View File

@ -14,7 +14,7 @@ import javax.annotation.Resource;
import java.util.Map;
@RestController
@RequestMapping("/adminapi/setting/hot_search")
@RequestMapping("/adminapi/setting.hot_search")
@Api(tags = "配置热门搜索")
public class SettingSearchController {

2
server/like-admin/src/main/java/com/mdd/admin/controller/setting/SettingSmsController.java
View File

@ -16,7 +16,7 @@ import java.util.Map;
* 短信设置管理
*/
@RestController
@RequestMapping("/adminapi/notice/sms_config")
@RequestMapping("/adminapi/notice.sms_config")
@Api(tags = "配置短信引擎")
public class SettingSmsController {

2
server/like-admin/src/main/java/com/mdd/admin/controller/setting/SettingStorageController.java
View File

@ -13,7 +13,7 @@ import java.util.List;
import java.util.Map;
@RestController
@RequestMapping("/adminapi/setting/storage")
@RequestMapping("/adminapi/setting.storage")
@Api(tags = "配置存储方式")
public class SettingStorageController {

2
server/like-admin/src/main/java/com/mdd/admin/controller/setting/SettingUserController.java
View File

@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@RestController
@RequestMapping("/adminapi/setting/user.user")
@RequestMapping("/adminapi/setting.user.user")
@Api(tags = "配置用户参数")
public class SettingUserController {

2
server/like-admin/src/main/java/com/mdd/admin/controller/setting/SettingWebsiteController.java
View File

@ -20,7 +20,7 @@ import javax.annotation.Resource;
import java.util.List;
@RestController
@RequestMapping("adminapi/setting/web.web_setting")
@RequestMapping("adminapi/setting.web.web_setting")
@Api(tags = "配置网站信息")
public class SettingWebsiteController {

2
server/like-admin/src/main/java/com/mdd/admin/controller/system/DeptController.java
View File

@ -19,7 +19,7 @@ import javax.annotation.Resource;
import java.util.List;
@RestController
@RequestMapping("/adminapi/dept/dept")
@RequestMapping("/adminapi/dept.dept")
@Api(tags = "系统部门管理")
public class DeptController {

2
server/like-admin/src/main/java/com/mdd/admin/controller/system/JobsController.java
View File

@ -23,7 +23,7 @@ import javax.annotation.Resource;
import java.util.List;
@RestController
@RequestMapping("/adminapi/dept/jobs")
@RequestMapping("/adminapi/dept.jobs")
@Api(tags = "系统岗位管理")
public class JobsController {

2
server/like-admin/src/main/java/com/mdd/admin/controller/system/SystemAuthAdminController.java
View File

@ -27,7 +27,7 @@ import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@RestController
@RequestMapping("/adminapi/auth/admin")
@RequestMapping("/adminapi/auth.admin")
@Api(tags = "系统用户管理")
public class SystemAuthAdminController {

3
server/like-admin/src/main/java/com/mdd/admin/controller/system/SystemAuthMenuController.java
View File

@ -21,7 +21,7 @@ import javax.annotation.Resource;
import java.util.List;
@RestController
@RequestMapping("/adminapi/auth/menu")
@RequestMapping("/adminapi/auth.menu")
@Api(tags = "系统菜单管理")
public class SystemAuthMenuController {
@ -55,6 +55,7 @@ public class SystemAuthMenuController {
@NotPower
@GetMapping("/all")
@ApiOperation(value="获取菜单列表")
public AjaxResult<JSONArray> all() {

2
server/like-admin/src/main/java/com/mdd/admin/controller/system/SystemAuthRoleController.java
View File

@ -20,7 +20,7 @@ import javax.annotation.Resource;
import java.util.List;
@RestController
@RequestMapping("/adminapi/auth/role")
@RequestMapping("/adminapi/auth.role")
@Api(tags = "系统角色管理")
public class SystemAuthRoleController {

2
server/like-admin/src/main/java/com/mdd/admin/controller/system/SystemCacheController.java
View File

@ -11,7 +11,7 @@ import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@RestController
@RequestMapping("/adminapi/setting/system.cache")
@RequestMapping("/adminapi/setting.system.cache")
@Api(tags = "系统缓存管理")
public class SystemCacheController {

2
server/like-admin/src/main/java/com/mdd/admin/controller/system/SystemLogsController.java
View File

@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
@RestController
@RequestMapping("/adminapi/setting/system.log")
@RequestMapping("/adminapi/setting.system.log")
@Api(tags = "系统日志管理")
public class SystemLogsController {