新增推送blog功能

jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/api/okki/blog/controller/OkkiBlogController.java

@@ -0,0 +1,177 @@
+package org.jeecg.modules.api.okki.blog.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.modules.api.okki.blog.entity.OkkiBlog;
+import org.jeecg.modules.api.okki.blog.service.IOkkiBlogService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Arrays;
+
+ /**
+ * @Description: 博客
+ * @Author: jeecg-boot
+ * @Date:   2024-05-09
+ * @Version: V1.0
+ */
+@Api(tags="博客")
+@RestController
+@RequestMapping("/blog/okkiBlog")
+@Slf4j
+public class OkkiBlogController extends JeecgController<OkkiBlog, IOkkiBlogService> {
+	@Autowired
+	private IOkkiBlogService okkiBlogService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param okkiBlog
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "博客-分页列表查询")
+	@ApiOperation(value="博客-分页列表查询", notes="博客-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<OkkiBlog>> queryPageList(OkkiBlog okkiBlog,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<OkkiBlog> queryWrapper = QueryGenerator.initQueryWrapper(okkiBlog, req.getParameterMap());
+		Page<OkkiBlog> page = new Page<OkkiBlog>(pageNo, pageSize);
+		IPage<OkkiBlog> pageList = okkiBlogService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 *   添加
+	 *
+	 * @param okkiBlog
+	 * @return
+	 */
+	@AutoLog(value = "博客-添加")
+	@ApiOperation(value="博客-添加", notes="博客-添加")
+	@RequiresPermissions("blog:okki_blog:add")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody OkkiBlog okkiBlog) {
+		okkiBlogService.save(okkiBlog);
+		return Result.OK("添加成功！");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @param okkiBlog
+	 * @return
+	 */
+	@AutoLog(value = "博客-编辑")
+	@ApiOperation(value="博客-编辑", notes="博客-编辑")
+	@RequiresPermissions("blog:okki_blog:edit")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody OkkiBlog okkiBlog) {
+		okkiBlog.setStatus(0);
+		okkiBlogService.updateById(okkiBlog);
+		return Result.OK("编辑成功!");
+	}
+	
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "博客-通过id删除")
+	@ApiOperation(value="博客-通过id删除", notes="博客-通过id删除")
+	@RequiresPermissions("blog:okki_blog:delete")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		okkiBlogService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+	
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "博客-批量删除")
+	@ApiOperation(value="博客-批量删除", notes="博客-批量删除")
+	@RequiresPermissions("blog:okki_blog:deleteBatch")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.okkiBlogService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+	
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "博客-通过id查询")
+	@ApiOperation(value="博客-通过id查询", notes="博客-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<OkkiBlog> queryById(@RequestParam(name="id",required=true) String id) {
+		OkkiBlog okkiBlog = okkiBlogService.getById(id);
+		if(okkiBlog==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(okkiBlog);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param okkiBlog
+    */
+    @RequiresPermissions("blog:okki_blog:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, OkkiBlog okkiBlog) {
+        return super.exportXls(request, okkiBlog, OkkiBlog.class, "博客");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    @RequiresPermissions("blog:okki_blog:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, OkkiBlog.class);
+    }
+
+	 /**
+	  * 变更状态
+	  * @param okkiBlog
+	  * @return
+	  */
+	 @PostMapping(value = "/status")
+	 public Result<String> changeStatus(@RequestBody OkkiBlog okkiBlog) throws Exception {
+		 boolean result = okkiBlogService.changeStatus(okkiBlog);
+		 if (result) {
+			 return Result.OK("操作成功");
+		 }else {
+			 return Result.error("操作失败");
+		 }
+	 }
+}

jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/api/okki/blog/entity/OkkiBlog.java

@@ -0,0 +1,94 @@
+package org.jeecg.modules.api.okki.blog.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Description: 博客
+ * @Author: jeecg-boot
+ * @Date:   2024-05-09
+ * @Version: V1.0
+ */
+@Data
+@TableName("okki_blog")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="okki_blog对象", description="博客")
+public class OkkiBlog implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private String id;
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+	/**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private String updateBy;
+	/**更新日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "更新日期")
+    private Date updateTime;
+    /**站点id*/
+    @Excel(name = "站点id", width = 15)
+    @ApiModelProperty(value = "站点id")
+    private Integer siteId;
+	/**博客标题*/
+	@Excel(name = "博客标题", width = 15)
+    @ApiModelProperty(value = "博客标题")
+    private String title;
+	/**主图url地址*/
+	@Excel(name = "主图url地址", width = 15)
+    @ApiModelProperty(value = "主图url地址")
+    private String pic;
+	/**博客URL路径*/
+	@Excel(name = "博客URL路径", width = 15)
+    @ApiModelProperty(value = "博客URL路径")
+    private String url;
+	/**博客内容*/
+	@Excel(name = "博客内容", width = 15)
+    @ApiModelProperty(value = "博客内容")
+    private String content;
+	/**添加时间*/
+	@Excel(name = "添加时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "添加时间")
+    private Date addtime;
+	/**服务商的blog主键id*/
+	@Excel(name = "服务商的blog主键id", width = 15)
+    @ApiModelProperty(value = "服务商的blog主键id")
+    private Integer uid;
+	/**ai检测分数*/
+	@Excel(name = "ai检测分数", width = 15)
+    @ApiModelProperty(value = "ai检测分数")
+    private Integer reportScore;
+	/**ai检测报告链接*/
+	@Excel(name = "ai检测报告链接", width = 15)
+    @ApiModelProperty(value = "ai检测报告链接")
+    private String reportLink;
+	/**同步状态*/
+	@Excel(name = "同步状态", width = 15)
+    @ApiModelProperty(value = "同步状态")
+    private Integer status;
+	/**创建日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建日期")
+    private Date createTime;
+}

jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/api/okki/blog/mapper/OkkiBlogMapper.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.api.okki.blog.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.api.okki.blog.entity.OkkiBlog;
+
+/**
+ * @Description: 博客
+ * @Author: jeecg-boot
+ * @Date:   2024-05-09
+ * @Version: V1.0
+ */
+public interface OkkiBlogMapper extends BaseMapper<OkkiBlog> {
+
+}

jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/api/okki/blog/mapper/xml/OkkiBlogMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.demo.blog.mapper.OkkiBlogMapper">
+
+</mapper>

jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/api/okki/blog/service/IOkkiBlogService.java

@@ -0,0 +1,15 @@
+package org.jeecg.modules.api.okki.blog.service;
+
+import org.jeecg.modules.api.okki.blog.entity.OkkiBlog;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 博客
+ * @Author: jeecg-boot
+ * @Date:   2024-05-09
+ * @Version: V1.0
+ */
+public interface IOkkiBlogService extends IService<OkkiBlog> {
+
+    boolean changeStatus(OkkiBlog okkiBlog);
+}

jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/api/okki/blog/service/impl/OkkiBlogServiceImpl.java

@@ -0,0 +1,87 @@
+package org.jeecg.modules.api.okki.blog.service.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.extern.slf4j.Slf4j;
+import org.jeecg.modules.api.okki.blog.entity.OkkiBlog;
+import org.jeecg.modules.api.okki.blog.mapper.OkkiBlogMapper;
+import org.jeecg.modules.api.okki.blog.service.IOkkiBlogService;
+import org.jeecg.modules.api.okki.utils.HttpClientUtils;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.text.SimpleDateFormat;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.TreeMap;
+
+/**
+ * @Description: 博客
+ * @Author: jeecg-boot
+ * @Date:   2024-05-09
+ * @Version: V1.0
+ */
+@Slf4j
+@Service
+public class OkkiBlogServiceImpl extends ServiceImpl<OkkiBlogMapper, OkkiBlog> implements IOkkiBlogService {
+
+    @Value("${OKKI.BASE_URL}")
+    private String URL;
+
+    @Value("${OKKI.CLIENT_SECRET}")
+    private String CLIENT_SECRET;
+
+    @Resource
+    private OkkiBlogMapper okkiBlogMapper;
+    @Override
+    public boolean changeStatus(OkkiBlog okkiBlog) {
+        OkkiBlog okkiBlog1 = okkiBlogMapper.selectById(okkiBlog.getId());
+        // 请求okki平台接口
+        Map<String, String> query = new TreeMap<>();
+        query.put("sign_method", "hmac-md5");
+        query.put("timestamp", String.valueOf(System.currentTimeMillis()));
+        query.put("site_id", String.valueOf(okkiBlog1.getSiteId()));
+        query.put("method", "save_blog");
+        okkiBlog.setStatus(1);
+        Map<String, Object> postData = new HashMap<>();
+        try {
+            String queryStr = HttpClientUtils.buildQueryString(query);
+            postData.put("title", okkiBlog1.getTitle());
+            postData.put("pic", okkiBlog1.getPic());
+            postData.put("url", okkiBlog1.getUrl());
+            postData.put("content", okkiBlog1.getContent());
+            // 时间转换
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            postData.put("addtime", sdf.format(okkiBlog1.getAddtime()));
+            postData.put("uid", okkiBlog1.getUid());
+            if (okkiBlog.getReportScore() != null) {
+                postData.put("report_score", okkiBlog1.getReportScore());
+            }
+            if (okkiBlog.getReportLink() != null) {
+                postData.put("report_link", okkiBlog1.getReportLink());
+            }
+            String body = HttpClientUtils.toJsonString(postData);
+            String signStr = queryStr + body;
+            query.put("signature", HttpClientUtils.generateHmacMD5(signStr, CLIENT_SECRET));
+            String okkiUrl = URL + "?" + HttpClientUtils.buildQueryString(query);
+            log.info("url:" + okkiUrl + ",body:" + body);
+            String res = HttpClientUtils.doPost(okkiUrl, body);
+            log.info(res);
+            // {"code":0,"msg":"success","now":"2024-05-06 15:34:54","data":[]}
+            JSONObject jsonObject= JSONObject.parseObject(res);
+            if (jsonObject.get("code").equals(0)) {
+                int result = okkiBlogMapper.updateById(okkiBlog);
+                if (result == 0) {
+                    return false;
+                }else {
+                    return true;
+                }
+            }else {
+                throw new RuntimeException(jsonObject.get("msg").toString());
+            }
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+}

jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/api/okki/site/controller/ShopApiController.java

@@ -29,9 +29,14 @@ public class ShopApiController {
         if (!authorization.equals(Authorization)) {
             return Result.error("sign 验证不通过");
         }
-        boolean save = okkiSiteService.save(okkiSite);
-        log.info("请求成功，返回结果" + save);
-        return Result.OK("添加成功！");
+        // 如果站点id已存在 则提示信息
+        boolean result = okkiSiteService.insertSite(okkiSite);
+        log.info("请求成功，返回结果" + result);
+        if (result) {
+            return Result.OK("添加成功！");
+        }else {
+            return Result.error("添加失败！");
+        }
     }
 
     @PostMapping(value = "/edit")
@@ -43,7 +48,7 @@ public class ShopApiController {
         }
         boolean result = okkiSiteService.updateBySiteId(okkiSite);
         log.info("请求成功，返回结果" + result);
-        if (result == true) {
+        if (result) {
             return Result.OK("编辑成功！");
         }else {
             return Result.error("编辑失败！");

jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/api/okki/site/service/IOkkiSiteService.java

@@ -17,4 +17,6 @@ public interface IOkkiSiteService extends IService<OkkiSite> {
     boolean changeStatus(OkkiSite okkiSite);
 
     boolean okkiChangeStatus(ChangeSiteStatusParam param);
+
+    boolean insertSite(OkkiSite okkiSite);
 }

jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/api/okki/site/service/impl/OkkiSiteServiceImpl.java

@@ -1,6 +1,7 @@
 package org.jeecg.modules.api.okki.site.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.extern.slf4j.Slf4j;
@@ -10,18 +11,11 @@ import org.jeecg.modules.api.okki.site.mapper.OkkiSiteMapper;
 import org.jeecg.modules.api.okki.site.param.ChangeSiteStatusParam;
 import org.jeecg.modules.api.okki.site.service.IOkkiSiteService;
 import org.jeecg.modules.api.okki.site.service.IOkkiSiteStatusChangeLogService;
+import org.jeecg.modules.api.okki.utils.HttpClientUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import javax.crypto.Mac;
-import javax.crypto.spec.SecretKeySpec;
-import java.io.BufferedReader;
-import java.io.DataOutputStream;
-import java.io.InputStreamReader;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.TreeMap;
@@ -81,13 +75,13 @@ public class OkkiSiteServiceImpl extends ServiceImpl<OkkiSiteMapper, OkkiSite> i
         Map<String, Object> postData = new HashMap<>();
         postData.put("status", okkiSite1.getStatus()+1);
         try {
-            String queryStr = buildQueryString(query);
-            String body = toJsonString(postData);
+            String queryStr = HttpClientUtils.buildQueryString(query);
+            String body = HttpClientUtils.toJsonString(postData);
             String signStr = queryStr + body;
-            query.put("signature", generateHmacMD5(signStr, CLIENT_SECRET));
-            String okkiUrl = URL + "?" + buildQueryString(query);
+            query.put("signature", HttpClientUtils.generateHmacMD5(signStr, CLIENT_SECRET));
+            String okkiUrl = URL + "?" + HttpClientUtils.buildQueryString(query);
             log.info("url:" + okkiUrl + ",body:" + body);
-            String res = doPost(okkiUrl, body);
+            String res = HttpClientUtils.doPost(okkiUrl, body);
             log.info(res);
             // {"code":0,"msg":"success","now":"2024-05-06 15:34:54","data":[]}
             JSONObject jsonObject= JSONObject.parseObject(res);
@@ -104,7 +98,7 @@ public class OkkiSiteServiceImpl extends ServiceImpl<OkkiSiteMapper, OkkiSite> i
                     return true;
                 }
             }else {
-                return false;
+                throw new RuntimeException(jsonObject.get("msg").toString());
             }
         } catch (Exception e) {
             throw new RuntimeException(e);
@@ -133,57 +127,13 @@ public class OkkiSiteServiceImpl extends ServiceImpl<OkkiSiteMapper, OkkiSite> i
         }
     }
 
-    private static String buildQueryString(Map<String, String> params) {
-        StringBuilder query = new StringBuilder();
-        for (Map.Entry<String, String> entry : params.entrySet()) {
-            if (query.length() > 0) {
-                query.append("&");
-            }
-            query.append(entry.getKey()).append("=").append(entry.getValue());
-        }
-        return query.toString();
-    }
-
-    private static String generateHmacMD5(String data, String secret) throws Exception {
-        SecretKeySpec keySpec = new SecretKeySpec(secret.getBytes(StandardCharsets.UTF_8), "HmacMD5");
-        Mac mac = Mac.getInstance("HmacMD5");
-        mac.init(keySpec);
-        byte[] hmacBytes = mac.doFinal(data.getBytes(StandardCharsets.UTF_8));
-        StringBuilder sb = new StringBuilder(hmacBytes.length * 2);
-        for (byte b : hmacBytes) {
-            sb.append(String.format("%02x", b));
-        }
-        return sb.toString();
-    }
-
-    private static String toJsonString(Object object) throws Exception {
-        com.google.gson.Gson gson = new com.google.gson.Gson();
-        return gson.toJson(object);
-    }
-
-    private static String doPost(String url, String data) throws Exception {
-        java.net.URL apiUrl = new URL(url);
-        System.out.println(url);
-        HttpURLConnection connection = (HttpURLConnection) apiUrl.openConnection();
-        connection.setRequestMethod("POST");
-        connection.setRequestProperty("Content-Type", "application/json");
-        connection.setDoOutput(true);
-        try (DataOutputStream outputStream = new DataOutputStream(connection.getOutputStream())) {
-            outputStream.write(data.getBytes(StandardCharsets.UTF_8));
-            outputStream.flush();
-        }
-
-        int responseCode = connection.getResponseCode();
-        if (responseCode == HttpURLConnection.HTTP_OK) {
-            try (BufferedReader in = new BufferedReader(new InputStreamReader(connection.getInputStream()))) {
-                String line;
-                StringBuilder response = new StringBuilder();
-                while ((line = in.readLine()) != null) {
-                    response.append(line);
-                }
-                return response.toString();
-            }
+    @Override
+    public boolean insertSite(OkkiSite okkiSite) {
+        OkkiSite okkiSite1 = okkiSiteMapper.selectOne(new LambdaQueryWrapper<OkkiSite>().eq(OkkiSite::getSite_id, okkiSite.getSite_id()));
+        if (okkiSite1 != null) {
+            throw new RuntimeException("site_id already exist");
+        }else {
+            return super.save(okkiSite);
         }
-        throw new Exception("HTTP request failed with response code: " + responseCode);
     }
 }

jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/api/okki/utils/HttpClientUtils.java

@@ -1,23 +1,13 @@
 package org.jeecg.modules.api.okki.utils;
 
-import org.apache.http.Consts;
-import org.apache.http.NameValuePair;
-import org.apache.http.client.entity.UrlEncodedFormEntity;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.client.utils.URIBuilder;
-import org.apache.http.entity.ContentType;
-import org.apache.http.entity.StringEntity;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClients;
-import org.apache.http.message.BasicNameValuePair;
-import org.apache.http.util.EntityUtils;
-
-import java.io.IOException;
-import java.net.URI;
-import java.util.ArrayList;
-import java.util.List;
+import javax.crypto.Mac;
+import javax.crypto.spec.SecretKeySpec;
+import java.io.BufferedReader;
+import java.io.DataOutputStream;
+import java.io.InputStreamReader;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
 import java.util.Map;
 
 
@@ -26,136 +16,57 @@ import java.util.Map;
  */
 public class HttpClientUtils {
 
-    /**
-     * 带参数的get请求
-     * @param url
-     * @param param
-     * @return String
-     */
-    public static String doGet(String url, Map<String, String> param) {
-        // 创建Httpclient对象
-        CloseableHttpClient httpclient = HttpClients.createDefault();
-
-        String resultString = "";
-        CloseableHttpResponse response = null;
-        try {
-            // 创建uri
-            URIBuilder builder = new URIBuilder(url);
-            if (param != null) {
-                for (String key : param.keySet()) {
-                    builder.addParameter(key, param.get(key));
-                }
-            }
-            URI uri = builder.build();
-            // 创建http GET请求
-            HttpGet httpGet = new HttpGet(uri);
-            // 执行请求
-            response = httpclient.execute(httpGet);
-            // 判断返回状态是否为200
-            if (response.getStatusLine().getStatusCode() == 200) {
-                resultString = EntityUtils.toString(response.getEntity(), "UTF-8");
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        } finally {
-            try {
-                if (response != null) {
-                    response.close();
-                }
-                httpclient.close();
-            } catch (IOException e) {
-                e.printStackTrace();
+    public static String buildQueryString(Map<String, String> params) {
+        StringBuilder query = new StringBuilder();
+        for (Map.Entry<String, String> entry : params.entrySet()) {
+            if (query.length() > 0) {
+                query.append("&");
             }
+            query.append(entry.getKey()).append("=").append(entry.getValue());
         }
-        return resultString;
-    }
-
-    /**
-     * 不带参数的get请求
-     * @param url
-     * @return String
-     */
-    public static String doGet(String url) {
-        return doGet(url, null);
+        return query.toString();
     }
 
-    /**
-     * 带参数的post请求
-     * @param url
-     * @param param
-     * @return String
-     */
-    public static String doPost(String url, Map<String, String> param) {
-        // 创建Httpclient对象
-        CloseableHttpClient httpClient = HttpClients.createDefault();
-        CloseableHttpResponse response = null;
-        String resultString = "";
-        try {
-            // 创建Http Post请求
-            HttpPost httpPost = new HttpPost(url);
-            // 创建参数列表
-            if (param != null) {
-                List<NameValuePair> paramList = new ArrayList<>();
-                for (String key : param.keySet()) {
-                    paramList.add(new BasicNameValuePair(key, param.get(key)));
-                }
-                // 模拟表单
-                UrlEncodedFormEntity entity = new UrlEncodedFormEntity(paramList, Consts.UTF_8);
-                httpPost.setEntity(entity);
-            }
-            // 执行http请求
-            response = httpClient.execute(httpPost);
-            resultString = EntityUtils.toString(response.getEntity(), "utf-8");
-        } catch (Exception e) {
-            e.printStackTrace();
-        } finally {
-            try {
-                response.close();
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
+    public static String generateHmacMD5(String data, String secret) throws Exception {
+        SecretKeySpec keySpec = new SecretKeySpec(secret.getBytes(StandardCharsets.UTF_8), "HmacMD5");
+        Mac mac = Mac.getInstance("HmacMD5");
+        mac.init(keySpec);
+        byte[] hmacBytes = mac.doFinal(data.getBytes(StandardCharsets.UTF_8));
+        StringBuilder sb = new StringBuilder(hmacBytes.length * 2);
+        for (byte b : hmacBytes) {
+            sb.append(String.format("%02x", b));
         }
-        return resultString;
+        return sb.toString();
     }
 
-    /**
-     * 不带参数的post请求
-     * @param url
-     * @return String
-     */
-    public static String doPost(String url) {
-        return doPost(url, null);
+    public static String toJsonString(Object object) throws Exception {
+        com.google.gson.Gson gson = new com.google.gson.Gson();
+        return gson.toJson(object);
     }
 
-    /**
-     * 传送json类型的post请求
-     * @param url
-     * @param json
-     * @return String
-     */
-    public static String doPostJson(String url, String json) {
-        // 创建Httpclient对象
-        CloseableHttpClient httpClient = HttpClients.createDefault();
-        CloseableHttpResponse response = null;
-        String resultString = "";
-        try {
-            // 创建Http Post请求
-            HttpPost httpPost = new HttpPost(url);
-            // 创建请求内容
-            StringEntity entity = new StringEntity(json, ContentType.APPLICATION_JSON);
-            httpPost.setEntity(entity);
-            // 执行http请求
-            response = httpClient.execute(httpPost);
-            resultString = EntityUtils.toString(response.getEntity(), "utf-8");
-        } catch (Exception e) {
-            e.printStackTrace();
-        } finally {
-            try {
-                response.close();
-            } catch (IOException e) {
-                e.printStackTrace();
+    public static String doPost(String url, String data) throws Exception {
+        java.net.URL apiUrl = new URL(url);
+        System.out.println(url);
+        HttpURLConnection connection = (HttpURLConnection) apiUrl.openConnection();
+        connection.setRequestMethod("POST");
+        connection.setRequestProperty("Content-Type", "application/json");
+        connection.setDoOutput(true);
+        try (DataOutputStream outputStream = new DataOutputStream(connection.getOutputStream())) {
+            outputStream.write(data.getBytes(StandardCharsets.UTF_8));
+            outputStream.flush();
+        }
+
+        int responseCode = connection.getResponseCode();
+        if (responseCode == HttpURLConnection.HTTP_OK) {
+            try (BufferedReader in = new BufferedReader(new InputStreamReader(connection.getInputStream()))) {
+                String line;
+                StringBuilder response = new StringBuilder();
+                while ((line = in.readLine()) != null) {
+                    response.append(line);
+                }
+                return response.toString();
             }
         }
-        return resultString;
+        throw new Exception("HTTP request failed with response code: " + responseCode);
     }
 }

jeecgboot-vue3/src/views/demo/feat/ws/index.vue

@@ -61,7 +61,7 @@
     },
     setup() {
       const state = reactive({
-        server: 'ws://localhost:3300/test',
+        server: 'ws://localhost:8080/shop-api/vxeSocket/1/1',
         sendValue: '',
         recordList: [] as { id: number; time: number; res: string }[],
       });

jeecgboot-vue3/src/views/okki/blog/OkkiBlog.api.ts

@@ -0,0 +1,64 @@
+import {defHttp} from '/@/utils/http/axios';
+import { useMessage } from "/@/hooks/web/useMessage";
+
+const { createConfirm } = useMessage();
+
+enum Api {
+  list = '/blog/okkiBlog/list',
+  save='/blog/okkiBlog/add',
+  edit='/blog/okkiBlog/edit',
+  deleteOne = '/blog/okkiBlog/delete',
+  deleteBatch = '/blog/okkiBlog/deleteBatch',
+  importExcel = '/blog/okkiBlog/importExcel',
+  exportXls = '/blog/okkiBlog/exportXls',
+}
+/**
+ * 导出api
+ * @param params
+ */
+export const getExportUrl = Api.exportXls;
+/**
+ * 导入api
+ */
+export const getImportUrl = Api.importExcel;
+/**
+ * 列表接口
+ * @param params
+ */
+export const list = (params) =>
+  defHttp.get({url: Api.list, params});
+
+/**
+ * 删除单个
+ */
+export const deleteOne = (params,handleSuccess) => {
+  return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => {
+    handleSuccess();
+  });
+}
+/**
+ * 批量删除
+ * @param params
+ */
+export const batchDelete = (params, handleSuccess) => {
+  createConfirm({
+    iconType: 'warning',
+    title: '确认删除',
+    content: '是否删除选中数据',
+    okText: '确认',
+    cancelText: '取消',
+    onOk: () => {
+      return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => {
+        handleSuccess();
+      });
+    }
+  });
+}
+/**
+ * 保存或者更新
+ * @param params
+ */
+export const saveOrUpdate = (params, isUpdate) => {
+  let url = isUpdate ? Api.edit : Api.save;
+  return defHttp.post({url: url, params});
+}

jeecgboot-vue3/src/views/okki/blog/OkkiBlog.data.ts

@@ -0,0 +1,142 @@
+import {BasicColumn} from '/@/components/Table';
+import {FormSchema} from '/@/components/Table';
+import { rules} from '/@/utils/helper/validator';
+import { render } from '/@/utils/common/renderUtils';
+//列表数据
+export const columns: BasicColumn[] = [
+   {
+    title: '博客标题',
+    align:"center",
+    dataIndex: 'title'
+   },
+   {
+    title: '主图url地址',
+    align:"center",
+    dataIndex: 'pic'
+   },
+   {
+    title: '博客URL路径',
+    align:"center",
+    dataIndex: 'url'
+   },
+   {
+    title: '博客内容',
+    align:"center",
+    dataIndex: 'content'
+   },
+   {
+    title: '添加时间',
+    align:"center",
+    dataIndex: 'addtime'
+   },
+   {
+    title: '服务商的blog主键id',
+    align:"center",
+    dataIndex: 'uid'
+   },
+   {
+    title: 'ai检测分数',
+    align:"center",
+    dataIndex: 'reportScore'
+   },
+   {
+    title: 'ai检测报告链接',
+    align:"center",
+    dataIndex: 'reportLink'
+   },
+   {
+    title: '同步状态',
+    align:"center",
+    dataIndex: 'status'
+   },
+   {
+    title: '创建日期',
+    align:"center",
+    dataIndex: 'createTime'
+   },
+];
+//查询数据
+export const searchFormSchema: FormSchema[] = [
+];
+//表单数据
+export const formSchema: FormSchema[] = [
+  {
+    label: '博客标题',
+    field: 'title',
+    component: 'Input',
+  },
+  {
+    label: '主图url地址',
+    field: 'pic',
+    component: 'Input',
+  },
+  {
+    label: '博客URL路径',
+    field: 'url',
+    component: 'Input',
+  },
+  {
+    label: '博客内容',
+    field: 'content',
+    component: 'Input',
+  },
+  {
+    label: '添加时间',
+    field: 'addtime',
+    component: 'DatePicker',
+    componentProps: {
+       showTime: true,
+       valueFormat: 'YYYY-MM-DD HH:mm:ss'
+     },
+  },
+  {
+    label: '服务商的blog主键id',
+    field: 'uid',
+    component: 'InputNumber',
+  },
+  {
+    label: 'ai检测分数',
+    field: 'reportScore',
+    component: 'InputNumber',
+  },
+  {
+    label: 'ai检测报告链接',
+    field: 'reportLink',
+    component: 'Input',
+  },
+  {
+    label: '同步状态',
+    field: 'status',
+    component: 'InputNumber',
+  },
+	// TODO 主键隐藏字段，目前写死为ID
+	{
+	  label: '',
+	  field: 'id',
+	  component: 'Input',
+	  show: false
+	},
+];
+
+// 高级查询数据
+export const superQuerySchema = {
+  title: {title: '博客标题',order: 0,view: 'text', type: 'string',},
+  pic: {title: '主图url地址',order: 1,view: 'text', type: 'string',},
+  url: {title: '博客URL路径',order: 2,view: 'text', type: 'string',},
+  content: {title: '博客内容',order: 3,view: 'text', type: 'string',},
+  addtime: {title: '添加时间',order: 4,view: 'datetime', type: 'string',},
+  uid: {title: '服务商的blog主键id',order: 5,view: 'number', type: 'number',},
+  reportScore: {title: 'ai检测分数',order: 6,view: 'number', type: 'number',},
+  reportLink: {title: 'ai检测报告链接',order: 7,view: 'text', type: 'string',},
+  status: {title: '同步状态',order: 8,view: 'number', type: 'number',},
+  createTime: {title: '创建日期',order: 9,view: 'datetime', type: 'string',},
+};
+
+/**
+* 流程表单调用这个方法获取formSchema
+* @param param
+*/
+export function getBpmFormSchema(_formData): FormSchema[]{
+  // 默认和原始表单保持一致 如果流程中配置了权限数据，这里需要单独处理formSchema
+  return formSchema;
+}

jeecgboot-vue3/src/views/okki/blog/OkkiBlogList.vue

@@ -0,0 +1,186 @@
+<template>
+  <div>
+    <!--引用表格-->
+   <BasicTable @register="registerTable" :rowSelection="rowSelection">
+     <!--插槽:table标题-->
+      <template #tableTitle>
+          <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
+          <a-button  type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
+          <j-upload-button  type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
+          <a-dropdown v-if="selectedRowKeys.length > 0">
+              <template #overlay>
+                <a-menu>
+                  <a-menu-item key="1" @click="batchHandleDelete">
+                    <Icon icon="ant-design:delete-outlined"></Icon>
+                    删除
+                  </a-menu-item>
+                </a-menu>
+              </template>
+              <a-button>批量操作
+                <Icon icon="mdi:chevron-down"></Icon>
+              </a-button>
+        </a-dropdown>
+        <!-- 高级查询 -->
+        <super-query :config="superQueryConfig" @search="handleSuperQuery" />
+      </template>
+       <!--操作栏-->
+      <template #action="{ record }">
+        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)"/>
+      </template>
+      <!--字段回显插槽-->
+      <template v-slot:bodyCell="{ column, record, index, text }">
+      </template>
+    </BasicTable>
+    <!-- 表单区域 -->
+    <OkkiBlogModal @register="registerModal" @success="handleSuccess"></OkkiBlogModal>
+  </div>
+</template>
+
+<script lang="ts" name="blog-okkiBlog" setup>
+  import {ref, reactive, computed, unref} from 'vue';
+  import {BasicTable, useTable, TableAction} from '/@/components/Table';
+  import {useModal} from '/@/components/Modal';
+  import { useListPage } from '/@/hooks/system/useListPage'
+  import OkkiBlogModal from './components/OkkiBlogModal.vue'
+  import {columns, searchFormSchema, superQuerySchema} from './OkkiBlog.data';
+  import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './OkkiBlog.api';
+  import { downloadFile } from '/@/utils/common/renderUtils';
+  import { useUserStore } from '/@/store/modules/user';
+  const queryParam = reactive<any>({});
+  const checkedKeys = ref<Array<string | number>>([]);
+  const userStore = useUserStore();
+  //注册model
+  const [registerModal, {openModal}] = useModal();
+  //注册table数据
+  const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({
+      tableProps:{
+           title: '博客',
+           api: list,
+           columns,
+           canResize:false,
+           formConfig: {
+              //labelWidth: 120,
+              schemas: searchFormSchema,
+              autoSubmitOnEnter:true,
+              showAdvancedButton:true,
+              fieldMapToNumber: [
+              ],
+              fieldMapToTime: [
+              ],
+            },
+           actionColumn: {
+               width: 120,
+               fixed:'right'
+            },
+            beforeFetch: (params) => {
+              return Object.assign(params, queryParam);
+            },
+      },
+       exportConfig: {
+            name:"博客",
+            url: getExportUrl,
+            params: queryParam,
+          },
+          importConfig: {
+            url: getImportUrl,
+            success: handleSuccess
+          },
+  })
+
+  const [registerTable, {reload},{ rowSelection, selectedRowKeys }] = tableContext
+
+  // 高级查询配置
+  const superQueryConfig = reactive(superQuerySchema);
+
+  /**
+   * 高级查询事件
+   */
+  function handleSuperQuery(params) {
+    Object.keys(params).map((k) => {
+      queryParam[k] = params[k];
+    });
+    reload();
+  }
+   /**
+    * 新增事件
+    */
+  function handleAdd() {
+     openModal(true, {
+       isUpdate: false,
+       showFooter: true,
+     });
+  }
+   /**
+    * 编辑事件
+    */
+  function handleEdit(record: Recordable) {
+     openModal(true, {
+       record,
+       isUpdate: true,
+       showFooter: true,
+     });
+   }
+   /**
+    * 详情
+   */
+  function handleDetail(record: Recordable) {
+     openModal(true, {
+       record,
+       isUpdate: true,
+       showFooter: false,
+     });
+   }
+   /**
+    * 删除事件
+    */
+  async function handleDelete(record) {
+     await deleteOne({id: record.id}, handleSuccess);
+   }
+   /**
+    * 批量删除事件
+    */
+  async function batchHandleDelete() {
+     await batchDelete({ids: selectedRowKeys.value}, handleSuccess);
+   }
+   /**
+    * 成功回调
+    */
+  function handleSuccess() {
+      (selectedRowKeys.value = []) && reload();
+   }
+   /**
+      * 操作栏
+      */
+  function getTableAction(record){
+       return [
+         {
+           label: '编辑',
+           onClick: handleEdit.bind(null, record),
+         }
+       ]
+   }
+     /**
+        * 下拉操作栏
+        */
+  function getDropDownAction(record){
+       return [
+         {
+           label: '详情',
+           onClick: handleDetail.bind(null, record),
+         }, {
+           label: '删除',
+           popConfirm: {
+             title: '是否确认删除',
+             confirm: handleDelete.bind(null, record),
+             placement: 'topLeft',
+           }
+         }
+       ]
+   }
+
+
+</script>
+
+<style scoped>
+
+</style>

jeecgboot-vue3/src/views/okki/blog/V20240509_1__menu_insert_OkkiBlog.sql

@@ -0,0 +1,26 @@
+-- 注意：该页面对应的前台目录为views/blog文件夹下
+-- 如果你想更改到其他目录，请修改sql中component字段对应的值
+
+
+INSERT INTO sys_permission(id, parent_id, name, url, component, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_route, is_leaf, keep_alive, hidden, hide_tab, description, status, del_flag, rule_flag, create_by, create_time, update_by, update_time, internal_or_external) 
+VALUES ('2024050912448720240', NULL, '博客', '/blog/okkiBlogList', 'blog/OkkiBlogList', NULL, NULL, 0, NULL, '1', 0.00, 0, NULL, 1, 0, 0, 0, 0, NULL, '1', 0, 0, 'admin', '2024-05-09 12:44:24', NULL, NULL, 0);
+
+-- 权限控制sql
+-- 新增
+INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
+VALUES ('2024050912448720241', '2024050912448720240', '添加博客', NULL, NULL, 0, NULL, NULL, 2, 'blog:okki_blog:add', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-05-09 12:44:24', NULL, NULL, 0, 0, '1', 0);
+-- 编辑
+INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
+VALUES ('2024050912448720242', '2024050912448720240', '编辑博客', NULL, NULL, 0, NULL, NULL, 2, 'blog:okki_blog:edit', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-05-09 12:44:24', NULL, NULL, 0, 0, '1', 0);
+-- 删除
+INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
+VALUES ('2024050912448720243', '2024050912448720240', '删除博客', NULL, NULL, 0, NULL, NULL, 2, 'blog:okki_blog:delete', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-05-09 12:44:24', NULL, NULL, 0, 0, '1', 0);
+-- 批量删除
+INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
+VALUES ('2024050912448720244', '2024050912448720240', '批量删除博客', NULL, NULL, 0, NULL, NULL, 2, 'blog:okki_blog:deleteBatch', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-05-09 12:44:24', NULL, NULL, 0, 0, '1', 0);
+-- 导出excel
+INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
+VALUES ('2024050912448720245', '2024050912448720240', '导出excel_博客', NULL, NULL, 0, NULL, NULL, 2, 'blog:okki_blog:exportXls', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-05-09 12:44:24', NULL, NULL, 0, 0, '1', 0);
+-- 导入excel
+INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
+VALUES ('2024050912448720246', '2024050912448720240', '导入excel_博客', NULL, NULL, 0, NULL, NULL, 2, 'blog:okki_blog:importExcel', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-05-09 12:44:24', NULL, NULL, 0, 0, '1', 0);

jeecgboot-vue3/src/views/okki/blog/components/OkkiBlogForm.vue

@@ -0,0 +1,70 @@
+<template>
+    <div style="min-height: 400px">
+        <BasicForm @register="registerForm"></BasicForm>
+        <div style="width: 100%;text-align: center" v-if="!formDisabled">
+            <a-button @click="submitForm" pre-icon="ant-design:check" type="primary">提 交</a-button>
+        </div>
+    </div>
+</template>
+
+<script lang="ts">
+    import {BasicForm, useForm} from '/@/components/Form/index';
+    import {computed, defineComponent} from 'vue';
+    import {defHttp} from '/@/utils/http/axios';
+    import { propTypes } from '/@/utils/propTypes';
+    import {getBpmFormSchema} from '../OkkiBlog.data';
+    import {saveOrUpdate} from '../OkkiBlog.api';
+    
+    export default defineComponent({
+        name: "OkkiBlogForm",
+        components:{
+            BasicForm
+        },
+        props:{
+            formData: propTypes.object.def({}),
+            formBpm: propTypes.bool.def(true),
+        },
+        setup(props){
+            const [registerForm, { setFieldsValue, setProps, getFieldsValue }] = useForm({
+                labelWidth: 150,
+                schemas: getBpmFormSchema(props.formData),
+                showActionButtonGroup: false,
+                baseColProps: {span: 24}
+            });
+
+            const formDisabled = computed(()=>{
+                if(props.formData.disabled === false){
+                    return false;
+                }
+                return true;
+            });
+
+            let formData = {};
+            const queryByIdUrl = '/blog/okkiBlog/queryById';
+            async function initFormData(){
+                let params = {id: props.formData.dataId};
+                const data = await defHttp.get({url: queryByIdUrl, params});
+                formData = {...data}
+                //设置表单的值
+                await setFieldsValue(formData);
+                //默认是禁用
+                await setProps({disabled: formDisabled.value})
+            }
+
+            async function submitForm() {
+                let data = getFieldsValue();
+                let params = Object.assign({}, formData, data);
+                console.log('表单数据', params)
+                await saveOrUpdate(params, true)
+            }
+
+            initFormData();
+            
+            return {
+                registerForm,
+                formDisabled,
+                submitForm,
+            }
+        }
+    });
+</script>

jeecgboot-vue3/src/views/okki/blog/components/OkkiBlogModal.vue

@@ -0,0 +1,66 @@
+<template>
+  <BasicModal v-bind="$attrs" @register="registerModal" destroyOnClose :title="title" :width="800" @ok="handleSubmit">
+      <BasicForm @register="registerForm"/>
+  </BasicModal>
+</template>
+
+<script lang="ts" setup>
+    import {ref, computed, unref} from 'vue';
+    import {BasicModal, useModalInner} from '/@/components/Modal';
+    import {BasicForm, useForm} from '/@/components/Form/index';
+    import {formSchema} from '../OkkiBlog.data';
+    import {saveOrUpdate} from '../OkkiBlog.api';
+    // Emits声明
+    const emit = defineEmits(['register','success']);
+    const isUpdate = ref(true);
+    //表单配置
+    const [registerForm, {setProps,resetFields, setFieldsValue, validate}] = useForm({
+        //labelWidth: 150,
+        schemas: formSchema,
+        showActionButtonGroup: false,
+        baseColProps: {span: 24}
+    });
+    //表单赋值
+    const [registerModal, {setModalProps, closeModal}] = useModalInner(async (data) => {
+        //重置表单
+        await resetFields();
+        setModalProps({confirmLoading: false,showCancelBtn:!!data?.showFooter,showOkBtn:!!data?.showFooter});
+        isUpdate.value = !!data?.isUpdate;
+        if (unref(isUpdate)) {
+            //表单赋值
+            await setFieldsValue({
+                ...data.record,
+            });
+        }
+        // 隐藏底部时禁用整个表单
+       setProps({ disabled: !data?.showFooter })
+    });
+    //设置标题
+    const title = computed(() => (!unref(isUpdate) ? '新增' : '编辑'));
+    //表单提交事件
+    async function handleSubmit(v) {
+        try {
+            let values = await validate();
+            setModalProps({confirmLoading: true});
+            //提交表单
+            await saveOrUpdate(values, isUpdate.value);
+            //关闭弹窗
+            closeModal();
+            //刷新列表
+            emit('success');
+        } finally {
+            setModalProps({confirmLoading: false});
+        }
+    }
+</script>
+
+<style lang="less" scoped>
+	/** 时间和数字输入框样式 */
+  :deep(.ant-input-number){
+		width: 100%
+	}
+
+	:deep(.ant-calendar-picker){
+		width: 100%
+	}
+</style>