。。

lxq-admin/src/main/java/com/lxq/admin/biz/controller/SysCommController.java

@@ -0,0 +1,40 @@
+package com.lxq.admin.biz.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.lxq.common.core.util.R;
+import com.lxq.common.excel.converters.ImportAsyncInfo;
+import lombok.RequiredArgsConstructor;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * SYS 通信控制器
+ *
+ * @author 没秃顶的码农
+ * @date 2024-07-26
+ */
+@RestController
+@RequestMapping("sysComm")
+@RequiredArgsConstructor
+public class SysCommController {
+
+    private final RedisTemplate<String, Object> redisTemplate;
+
+
+    /**
+     * 获取进度条
+     *
+     * @param key 钥匙
+     * @return {@link R}
+     */
+    @GetMapping("/getProgress")
+    public R getProgress(@RequestParam("key") String key){
+        Object obj = redisTemplate.opsForValue().get(key);
+
+        return R.ok(obj != null ? JSON.parseObject(obj.toString(), ImportAsyncInfo.class) : null);
+    }
+
+}

lxq-admin/src/main/java/com/lxq/admin/biz/controller/SysFileController.java

@@ -1,6 +1,7 @@
 
 package com.lxq.admin.biz.controller;
 
+import cn.hutool.core.text.CharSequenceUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -47,10 +48,11 @@ public class SysFileController {
      */
     @Operation(summary = "分页查询", description = "分页查询")
     @GetMapping("/page")
-    public R getSysFilePage(@ParameterObject Page page, @ParameterObject SysFile sysFile) {
+    public R getSysFilePage(@ParameterObject Page<SysFile> page, @ParameterObject SysFile sysFile) {
         LambdaQueryWrapper<SysFile> wrapper = Wrappers.<SysFile>lambdaQuery()
 				.eq(sysFile.getType() != null, SysFile::getType, sysFile.getType())
-                .like(StrUtil.isNotBlank(sysFile.getFileName()), SysFile::getFileName, sysFile.getFileName())
+                .like(CharSequenceUtil.isNotBlank(sysFile.getFileName()), SysFile::getFileName, sysFile.getFileName())
+                .like(CharSequenceUtil.isNotBlank(sysFile.getTitle()), SysFile::getTitle, sysFile.getTitle())
                 .orderByDesc(SysFile::getId);
         return R.ok(sysFileService.page(page, wrapper));
     }
@@ -76,8 +78,8 @@ public class SysFileController {
      * @param file 资源
      * @return R
      */
-    @Inner
     @PostMapping(value = "/save")
+    @PreAuthorize("@pms.hasPermission('sys_file_save')")
     public R save(@Valid @RequestBody SysFile file) {
 
         return R.ok(sysFileService.save(file));

lxq-admin/src/main/java/com/lxq/admin/biz/controller/SysRuleMakingController.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.lxq.common.core.util.R;
 import com.lxq.common.log.annotation.SysLog;
 import com.lxq.system.biz.domain.dto.SysRuleMakingDTO;
-import com.lxq.system.biz.model.SysRuleMaking;
+import com.lxq.system.biz.model.SysRulemaking;
 import com.lxq.system.biz.service.SysRuleMakingService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -35,7 +35,7 @@ public class SysRuleMakingController {
      * @return 协议管理-列表
      */
     @GetMapping("/page")
-    public R ruleMakingPage(Page<SysRuleMaking> page, SysRuleMakingDTO param) {
+    public R ruleMakingPage(Page<SysRulemaking> page, SysRuleMakingDTO param) {
         sysRuleMakingService.ruleMakingPage(page,param);
         return R.ok(page);
     }
@@ -47,9 +47,9 @@ public class SysRuleMakingController {
      * @return 协议管理-新增或修改
      */
     @SysLog("协议管理-新增或修改")
-    @PutMapping("/addOrUpdate")
+    @PostMapping("/addOrUpdate")
     @PreAuthorize("@pms.hasPermission('sys_ruleMaking_addOrUpdate')")
-    public R addOrUpdate(@RequestBody SysRuleMaking param) {
+    public R addOrUpdate(@RequestBody SysRulemaking param) {
 
         return R.ok(sysRuleMakingService.saveOrUpdate(param));
     }

lxq-admin/src/main/java/com/lxq/admin/biz/controller/TokenController.java

@@ -4,6 +4,7 @@ package com.lxq.admin.biz.controller;
 import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.date.TemporalAccessorUtil;
 import cn.hutool.core.map.MapUtil;
+import cn.hutool.core.text.CharSequenceUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.lxq.common.core.constant.CacheConstants;
@@ -12,6 +13,7 @@ import com.lxq.common.core.constant.enums.ErrorTypeEnum;
 import com.lxq.common.core.util.R;
 import com.lxq.common.core.util.SpringContextHolder;
 import com.lxq.common.log.annotation.SysLog;
+import com.lxq.common.security.annotation.Inner;
 import com.lxq.common.security.util.OAuth2EndpointUtils;
 import com.lxq.common.security.util.OAuthClientException;
 import com.lxq.system.biz.model.SysOauthClientDetails;
@@ -104,9 +106,10 @@ public class TokenController {
 	 *
 	 * @param authHeader Authorization
 	 */
+	@Inner(value = false)
 	@DeleteMapping("/logout")
 	public R logout(@RequestHeader(value = HttpHeaders.AUTHORIZATION, required = false) String authHeader) {
-		if (StrUtil.isBlank(authHeader)) {
+		if (CharSequenceUtil.isBlank(authHeader)) {
 			return R.ok();
 		}
 

lxq-common/lxq-common-core/src/main/java/com/lxq/common/core/constant/enums/MenuTypeEnum.java

@@ -17,17 +17,21 @@ public enum MenuTypeEnum {
 	/**
 	 * 目录
 	 */
-	LEFT_MENU("0", "目录"),
+	CATALOG("0", "目录"),
 
 	/**
 	 * 菜单
 	 */
-	TOP_MENU("1", "菜单"),
+	MENU("1", "菜单"),
 
 	/**
 	 * 按钮
 	 */
-	BUTTON("2", "button");
+	BUTTON("2", "button"),
+
+	IFRAME("3", "iframe"),
+
+	LINK("4", "link");
 
 	/**
 	 * 类型

lxq-common/lxq-common-oss/src/main/java/com/lxq/common/file/oss/service/OssTemplate.java

@@ -41,9 +41,9 @@ public class OssTemplate implements InitializingBean {
 
 		String format = LocalDate.now().format(DatePattern.NORM_DATE_FORMATTER);
 		// 用户上传文件时指定的前缀。
-		String dir = properties.getFilePrefix() + StrUtil.SLASH + dirStr + StrUtil.SLASH + format + StrUtil.SLASH + UUID.randomUUID();
+		String dir = properties.getFilePrefix() + StrUtil.SLASH + dirStr + StrUtil.SLASH + format;
 		//上传过期时间
-		long expireEndTime = System.currentTimeMillis() + 30 * 1000;
+		long expireEndTime = System.currentTimeMillis() + 300 * 1000;
 		Date expiration = new Date(expireEndTime);
 		// PostObject请求最大可支持的即CONTENT_LENGTH_RANGE为5*1024*1024*1024。
 		PolicyConditions policyCords = new PolicyConditions();

lxq-system/src/main/java/com/lxq/system/biz/mapper/SysRuleMakingMapper.java

@@ -1,7 +1,7 @@
 package com.lxq.system.biz.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.lxq.system.biz.model.SysRuleMaking;
+import com.lxq.system.biz.model.SysRulemaking;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
@@ -11,7 +11,7 @@ import org.apache.ibatis.annotations.Mapper;
  * @since 2023-12-15 12:16:31
  */
 @Mapper
-public interface SysRuleMakingMapper extends BaseMapper<SysRuleMaking> {
+public interface SysRuleMakingMapper extends BaseMapper<SysRulemaking> {
 
 }
 

lxq-system/src/main/java/com/lxq/system/biz/model/SysMenu.java

@@ -72,10 +72,10 @@ public class SysMenu extends Model<SysMenu> {
 	private String path;
 
 	/**
-	 * 是否外链， 0是否，1是
+	 * 链接地址
 	 */
-	@Schema(description = "是否外链， 0是否，1是")
-	private String link;
+	@Schema(description = "链接地址")
+	private String linkUrl;
 
 	/**
 	 * 菜单显示隐藏控制
@@ -93,7 +93,7 @@ public class SysMenu extends Model<SysMenu> {
 	 * 菜单类型 （0菜单 1按钮）
 	 */
 	@NotNull(message = "菜单类型不能为空")
-	@Schema(description = "菜单类型,0:菜单 1:按钮")
+	@Schema(description = "菜单类型,0:目录 1:菜单 1:按钮")
 	private String menuType;
 
 	/**
@@ -102,9 +102,6 @@ public class SysMenu extends Model<SysMenu> {
 	@Schema(description = "路由缓冲")
 	private String keepAlive;
 
-	@Schema(description = "菜单是否内嵌")
-	private String embedded;
-
 	/**
 	 * 创建人
 	 */

lxq-system/src/main/java/com/lxq/system/biz/model/SysRuleMaking.java → lxq-system/src/main/java/com/lxq/system/biz/model/SysRulemaking.java

@@ -15,14 +15,14 @@ import java.io.Serializable;
 import java.time.LocalDateTime;
 
 /**
- * 客小爽协议规则表(SysRuleMaking)表实体类
+ * 客小爽协议规则表(SysRulemaking)表实体类
  *
  * @author 系统
  * @since 2023-12-15 12:16:31
  */
 @EqualsAndHashCode(callSuper = true)
 @Data
-public class SysRuleMaking extends Model<SysRuleMaking> implements Serializable {
+public class SysRulemaking extends Model<SysRulemaking> implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 1L;
@@ -80,15 +80,5 @@ public class SysRuleMaking extends Model<SysRuleMaking> implements Serializable
     @Schema(description = "标题")
     private String title;
 
-
-    /**
-     * 类型 0注册协议 1服务协议 2创客守则 3提现规则
-     */
-    @Schema(description = "类型 0注册协议 1服务协议 2创客守则 3提现规则")
-    private Integer ruleType;
-
-
-
-
 }
 

lxq-system/src/main/java/com/lxq/system/biz/service/SysRuleMakingService.java

@@ -3,7 +3,7 @@ package com.lxq.system.biz.service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.lxq.system.biz.domain.dto.SysRuleMakingDTO;
-import com.lxq.system.biz.model.SysRuleMaking;
+import com.lxq.system.biz.model.SysRulemaking;
 
 /**
  * 客小爽协议规则表(LkbMaking)表服务接口
@@ -11,7 +11,7 @@ import com.lxq.system.biz.model.SysRuleMaking;
  * @author 系统
  * @since 2023-12-15 12:16:31
  */
-public interface SysRuleMakingService extends IService<SysRuleMaking> {
+public interface SysRuleMakingService extends IService<SysRulemaking> {
 
     /**
      * 分页查询协议列表

lxq-system/src/main/java/com/lxq/system/biz/service/impl/SysMenuServiceImpl.java

@@ -6,7 +6,6 @@ import cn.hutool.core.lang.tree.TreeNode;
 import cn.hutool.core.lang.tree.TreeUtil;
 import cn.hutool.core.text.CharSequenceUtil;
 import cn.hutool.core.util.BooleanUtil;
-import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.lxq.common.core.constant.CacheConstants;
@@ -142,27 +141,26 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
 			node.setWeight(menu.getSortOrder());
 			// 扩展属性
 			Map<String, Object> extra = new HashMap<>();
-
-			if(Boolean.TRUE.equals(BooleanUtil.toBooleanObject(menu.getEmbedded()))){
-
+			// 适配 vue3
+			Map<String, Object> meta = new HashMap<>();
+			if(menu.getMenuType().equals(MenuTypeEnum.IFRAME.getType())){
 				extra.put("component", "IFrameView");
-				extra.put("path", "/system/iframe");
-			}else {
+				meta.put("iframeSrc", menu.getLinkUrl());
+			}
+			if(menu.getMenuType().equals(MenuTypeEnum.LINK.getType())){
+				meta.put("link", menu.getLinkUrl());
+			}
+			if(menu.getMenuType().equals(MenuTypeEnum.MENU.getType())){
 				extra.put("component", menu.getPath());
-				extra.put("path", menu.getPath());
 			}
+			extra.put("path", menu.getPath());
 			extra.put("menuType", menu.getMenuType());
 			extra.put("permission", menu.getPermission());
 
-			// 适配 vue3
-			Map<String, Object> meta = new HashMap<>();
 			meta.put("title", menu.getName());
-			meta.put("link", Boolean.TRUE.equals(BooleanUtil.toBooleanObject(menu.getLink())) ? menu.getPath() : "");
 			meta.put("hideInMenu", BooleanUtil.toBooleanObject(menu.getVisible()));
 			meta.put("keepAlive", BooleanUtil.toBooleanObject(menu.getKeepAlive()));
 			meta.put("affixTab", false);
-			meta.put("isIframe", BooleanUtil.toBooleanObject(menu.getEmbedded()));
-			meta.put("iframeSrc", Boolean.TRUE.equals(BooleanUtil.toBooleanObject(menu.getEmbedded())) ? menu.getPath() : "");
 			meta.put("icon", menu.getIcon());
 			meta.put("order", menu.getSortOrder());
 
@@ -179,8 +177,8 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
 	 */
 	private Predicate<SysMenu> menuTypePredicate(String type) {
 		return vo -> {
-			if (MenuTypeEnum.TOP_MENU.getDescription().equals(type)) {
-				return MenuTypeEnum.TOP_MENU.getType().equals(vo.getMenuType());
+			if (MenuTypeEnum.MENU.getDescription().equals(type)) {
+				return MenuTypeEnum.MENU.getType().equals(vo.getMenuType());
 			}
 			// 其他查询 左侧 + 顶部
 			return !MenuTypeEnum.BUTTON.getType().equals(vo.getMenuType());

lxq-system/src/main/java/com/lxq/system/biz/service/impl/SysRuleMakingServiceImpl.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.lxq.system.biz.domain.dto.SysRuleMakingDTO;
 import com.lxq.system.biz.mapper.SysRuleMakingMapper;
-import com.lxq.system.biz.model.SysRuleMaking;
+import com.lxq.system.biz.model.SysRulemaking;
 import com.lxq.system.biz.service.SysRuleMakingService;
 import org.springframework.stereotype.Service;
 
@@ -19,14 +19,14 @@ import java.util.List;
  * @since 2023-12-15 12:16:31
  */
 @Service("LkbRuleMakingService")
-public class SysRuleMakingServiceImpl extends ServiceImpl<SysRuleMakingMapper, SysRuleMaking> implements SysRuleMakingService {
+public class SysRuleMakingServiceImpl extends ServiceImpl<SysRuleMakingMapper, SysRulemaking> implements SysRuleMakingService {
 
     @Override
     public void ruleMakingPage(Page page, SysRuleMakingDTO param) {
-        LambdaQueryWrapper<SysRuleMaking> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.like(StringUtils.isNotBlank(param.getTitle()),SysRuleMaking::getTitle,param.getTitle())
-                .orderByDesc(SysRuleMaking::getCreateTime);
-        List<SysRuleMaking> list = this.list(page, queryWrapper);
+        LambdaQueryWrapper<SysRulemaking> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.like(StringUtils.isNotBlank(param.getTitle()), SysRulemaking::getTitle,param.getTitle())
+                .orderByDesc(SysRulemaking::getCreateTime);
+        List<SysRulemaking> list = this.list(page, queryWrapper);
         if(page != null){
             page.setRecords(list);
         }

lxq-system/src/main/resources/mapper/SysMenuMapper.xml

@@ -18,9 +18,8 @@
 		<result column="create_time" property="createTime"/>
 		<result column="update_time" property="updateTime"/>
 		<result column="del_flag" property="delFlag"/>
-		<result column="embedded" property="embedded"/>
+		<result column="link_url" property="linkUrl"/>
 		<result column="visible" property="visible"/>
-		<result column="link" property="link"/>
 	</resultMap>
 
 	<!--通过角色查询菜单信息-->
@@ -38,9 +37,8 @@
 			   sys_menu.create_time,
 			   sys_menu.update_time,
 			   sys_menu.del_flag,
-			   sys_menu.embedded,
 			   sys_menu.visible,
-			   sys_menu.link
+			   sys_menu.link_url
 		FROM sys_menu
 					 LEFT JOIN sys_role_menu ON sys_menu.menu_id = sys_role_menu.menu_id
 		WHERE sys_menu.del_flag = '0'