F

pom.xml

@@ -19,7 +19,8 @@
         <wx.version>4.4.0</wx.version>
         <lombok.version>1.18.22</lombok.version>
         <mybatis-plus.version>3.5.1</mybatis-plus.version>
-        <dynamic-datasource.version>3.5.1</dynamic-datasource.version>
+        <sa-token.version>1.34.0</sa-token.version>
+<!--        <dynamic-datasource.version>3.5.1</dynamic-datasource.version>-->
     </properties>
     <dependencies>
         <!--web依赖-->
@@ -39,11 +40,11 @@
         </dependency>
         <!--swagger end-->
         <!-- 企业号/企业微信 -->
-        <dependency>
-            <groupId>com.github.binarywang</groupId>
-            <artifactId>weixin-java-cp</artifactId>
-            <version>${wx.version}</version>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>com.github.binarywang</groupId>-->
+<!--            <artifactId>weixin-java-cp</artifactId>-->
+<!--            <version>${wx.version}</version>-->
+<!--        </dependency>-->
 
         <dependency>
             <groupId>org.projectlombok</groupId>
@@ -58,11 +59,11 @@
             <version>${mybatis-plus.version}</version>
         </dependency>
         <!-- oracle -->
-        <dependency>
-            <groupId>com.oracle.database.jdbc</groupId>
-            <artifactId>ojdbc8</artifactId>
-            <scope>runtime</scope>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>com.oracle.database.jdbc</groupId>-->
+<!--            <artifactId>ojdbc8</artifactId>-->
+<!--            <scope>runtime</scope>-->
+<!--        </dependency>-->
 
         <!-- mysql -->
         <dependency>
@@ -71,12 +72,18 @@
             <scope>runtime</scope>
         </dependency>
 
-        <!-- 多数据源 -->
         <dependency>
-            <groupId>com.baomidou</groupId>
-            <artifactId>dynamic-datasource-spring-boot-starter</artifactId>
-            <version>${dynamic-datasource.version}</version>
+            <groupId>cn.dev33</groupId>
+            <artifactId>sa-token-spring-boot-starter</artifactId>
+            <version>${sa-token.version}</version>
         </dependency>
+
+<!--        &lt;!&ndash; 多数据源 &ndash;&gt;-->
+<!--        <dependency>-->
+<!--            <groupId>com.baomidou</groupId>-->
+<!--            <artifactId>dynamic-datasource-spring-boot-starter</artifactId>-->
+<!--            <version>${dynamic-datasource.version}</version>-->
+<!--        </dependency>-->
     </dependencies>
 
     <build>

src/main/java/com/lyg/tools/controller/UploadController.java

@@ -3,13 +3,11 @@ package com.lyg.tools.controller;
 import com.lyg.tools.common.FileUtil;
 import com.lyg.tools.common.ResponseBean;
 import com.lyg.tools.common.StringUtil;
-import com.lyg.tools.hangxin.WxUtil;
 import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
-import java.io.File;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -18,28 +16,33 @@ import java.util.Map;
 @RequestMapping("/")
 public class UploadController {
 
-    @Autowired
-    WxUtil wxUtil;
-
     @Autowired
     FileUtil fileUtil;
 
+    public static String getFileType(MultipartFile file) throws Exception {
+        String fileName = file.getOriginalFilename();
+        // 通过文件名获取文件后缀，并与MIME类型映射表对比获取文件类型
+        String fileSuffix = fileName.substring(fileName.lastIndexOf(".") + 1);
+        // 这里可以扩展为查询MIME类型映射表
+        return fileSuffix;
+    }
+
     /**
      * 通用端上传文件
      *
-     * @param appid 应用Id
      * @return
      * @throws Exception
      */
-    @PostMapping("/upload/admin/{appid}")
-    public ResponseBean uploadAdmin(@RequestParam(value = "file") MultipartFile multipartFile,
-                               @PathVariable(value = "appid") String appid
-    ) throws Exception {
+    @PostMapping("/upload/cms")
+    public ResponseBean uploadAdmin(@RequestParam(value = "file") MultipartFile file) throws Exception {
+        String fileType = getFileType(file);
 
         Map<String, Object> res = new HashMap<>();
-        String path = fileUtil.saveFile(multipartFile,  appid);
-        res.put("url", path);
-
+        String fileName = file.getOriginalFilename();
+        String path = fileUtil.saveFile(file, "cms");
+        res.put("attachUrl", path);
+        res.put("attachName", fileName);
+        res.put("fileType", fileType);
         return ResponseBean.success(res);
     }
 
@@ -52,8 +55,8 @@ public class UploadController {
      */
     @PostMapping("/upload/base64/{appid}")
     public ResponseBean uploadBase64(@PathVariable(value = "appid") String appid,
-                                 @RequestParam(value = "base64") String base64,
-                                 @RequestParam(value = "fileName", defaultValue = "unknown.jpg") String fileName
+                                     @RequestParam(value = "base64") String base64,
+                                     @RequestParam(value = "fileName", defaultValue = "unknown.jpg") String fileName
     ) throws Exception {
 
         Map<String, Object> res = new HashMap<>();
@@ -65,25 +68,5 @@ public class UploadController {
         return ResponseBean.success(res);
     }
 
-    /**
-     * 企业微信上传文件
-     *
-     * @param appid 应用Id
-     * @return
-     * @throws Exception
-     */
-    @PostMapping("/upload/h5/{appid}")
-    public ResponseBean uploadH5(@PathVariable(value = "appid") String appid,
-                               @RequestParam(value = "mediaId") String mediaId,
-                               @RequestParam(value = "fileName", defaultValue = "unknown.jpg") String fileName
-    ) throws Exception {
-
-        Map<String, Object> res = new HashMap<>();
-        File file = wxUtil.downloadMedia(mediaId);
-        String path = fileUtil.saveFile(file, fileName, appid);
-        res.put("url", path);
-
-        return ResponseBean.success(res);
-    }
 
 }

src/main/java/com/lyg/tools/controller/WxCpController.java

@@ -1,42 +0,0 @@
-package com.lyg.tools.controller;
-
-import com.lyg.tools.common.FileUtil;
-import com.lyg.tools.common.ResponseBean;
-import com.lyg.tools.hangxin.WxUtil;
-//import io.swagger.annotations.Api;
-//import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import me.chanjar.weixin.common.bean.WxJsapiSignature;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-
-import java.io.File;
-import java.util.HashMap;
-import java.util.Map;
-
-
-@Api(tags = "企业微信")
-@RestController
-@RequestMapping("/")
-public class WxCpController {
-
-    @Autowired
-    WxUtil wxUtil;
-
-    @Autowired
-    FileUtil fileUtil;
-
-    @Value("${yz.env}")
-    String env;
-
-    @ApiOperation("获取 JS-SDK config")
-    @GetMapping("/h5/jsconfig")
-    public ResponseBean getJsConfig(@ApiParam("页面路径") @RequestParam("url") String url) throws Exception {
-        WxJsapiSignature jsconfig = wxUtil.jsconfig(url);
-        return ResponseBean.success(jsconfig);
-    }
-}

src/main/java/com/lyg/tools/entity/MessageSmBox.java

@@ -1,52 +0,0 @@
-package com.lyg.tools.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
-/**
-* 消息表-mysql;
-* @author : http://www.chiner.pro
-* @date : 2023-2-7
-*/
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@ApiModel(value = "消息表-mysql",description = "")
-@TableName("Message_sm_box")
-public class MessageSmBox implements Serializable,Cloneable{
-   /** 消息id */
-   @ApiModelProperty(name = "消息id",notes = "")
-   @TableId(value = "id", type = IdType.AUTO)
-   private Integer id ;
-   /** 消息内容 */
-   @ApiModelProperty(name = "消息内容",notes = "")
-   private String message ;
-   /** 手机号 */
-   @ApiModelProperty(name = "手机号",notes = "")
-   private String phone ;
-   /** 应用id;用于记录是哪个应用使用的短信 */
-   @ApiModelProperty(name = "应用id",notes = "用于记录是哪个应用使用的短信")
-   private String appid ;
-   /** 渠道标识;1、联通短信 ;2、行信;4、移动；3、行信和联通 */
-   @ApiModelProperty(name = "渠道标识",notes = "1、联通短信 ;2、行信;4、移动；3、行信和联通")
-   private Integer chn ;
-   /** 员工EHR号 */
-   @ApiModelProperty(name = "员工EHR号",notes = "")
-   private String user ;
-   /** 创建时间 */
-   @ApiModelProperty(name = "创建时间",notes = "")
-   private LocalDateTime dataDate ;
-   /** 备注 */
-   @ApiModelProperty(name = "备注",notes = "")
-   private String remark ;
-
-}

src/main/java/com/lyg/tools/entity/TaAttach.java

@@ -0,0 +1,62 @@
+package com.lyg.tools.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * 附件表;
+ *
+ * @author : http://www.chiner.pro
+ * @date : 2024-3-22
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "附件表", description = "")
+@TableName("ta_attach")
+public class TaAttach implements Serializable, Cloneable {
+
+    @ApiModelProperty(name = "附件Id", notes = "")
+    @TableId(value = "attach_id", type = IdType.ASSIGN_UUID)
+    private String attachId;
+
+    @ApiModelProperty(name = "附件名", notes = "")
+    private String attachName;
+
+    @ApiModelProperty(name = "附件地址", notes = "")
+    private String attachUrl;
+
+    @ApiModelProperty(name = "文件类型", notes = "")
+    private String fileType;
+
+    @ApiModelProperty(name = "状态", notes = "0 正常 1不正常")
+    private Integer status;
+
+    @ApiModelProperty(name = "", notes = "")
+    @TableField(fill = FieldFill.INSERT)
+    private LocalDateTime createdTime;
+
+    @ApiModelProperty(name = "", notes = "")
+    @TableField(fill = FieldFill.INSERT)
+    private String createdBy;
+
+    @ApiModelProperty(name = "", notes = "")
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private LocalDateTime updatedTime;
+
+    @ApiModelProperty(name = "", notes = "")
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private String updatedBy;
+
+    @ApiModelProperty(name = "", notes = "0 存在 1 删除")
+    @TableField(fill = FieldFill.INSERT)
+    private Integer deleted;
+
+}

src/main/java/com/lyg/tools/hangxin/CpConfig.java

@@ -1,13 +0,0 @@
-package com.lyg.tools.hangxin;
-
-
-import lombok.Data;
-import me.chanjar.weixin.cp.config.impl.WxCpDefaultConfigImpl;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.stereotype.Component;
-
-@Data
-@Component
-@ConfigurationProperties(prefix = "wx.cp")
-public class CpConfig extends WxCpDefaultConfigImpl {
-}

src/main/java/com/lyg/tools/hangxin/WxUtil.java

@@ -1,37 +0,0 @@
-package com.lyg.tools.hangxin;
-
-
-import me.chanjar.weixin.common.bean.WxJsapiSignature;
-import me.chanjar.weixin.common.error.WxErrorException;
-import me.chanjar.weixin.cp.api.impl.WxCpServiceImpl;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import java.io.File;
-
-@Component
-public class WxUtil {
-
-    CpConfig cpConfig;
-    WxCpServiceImpl wxCpService = new WxCpServiceImpl();
-
-    @Autowired
-    public WxUtil(CpConfig cpConfig) {
-        this.cpConfig = cpConfig;
-
-        initCpService(cpConfig);
-    }
-
-    void initCpService(CpConfig cpConfig) {
-        wxCpService.setWxCpConfigStorage(cpConfig);
-    }
-
-    public File downloadMedia(String mediaId) throws WxErrorException {
-        return wxCpService.getMediaService().download(mediaId);
-    }
-
-    public WxJsapiSignature jsconfig(String url) throws WxErrorException {
-        WxJsapiSignature jsapiSignature = wxCpService.createJsapiSignature(url);
-        return jsapiSignature;
-    }
-}

src/main/java/com/lyg/tools/mapper/MessageSmBoxMapper.java

@@ -1,15 +0,0 @@
-package com.lyg.tools.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.lyg.tools.entity.MessageSmBox;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
-* 消息表-mysql;(Message_sm_box)表数据库访问层
-* @author : http://njyunzhi.com
-* @date : 2023-2-7
-*/
-@Mapper
-public interface MessageSmBoxMapper extends BaseMapper<MessageSmBox>{
-
-}

src/main/java/com/lyg/tools/mapper/TaAttachMapper.java

@@ -0,0 +1,16 @@
+package com.lyg.tools.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.lyg.tools.entity.TaAttach;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 搜索附件表;(ta_search_attach)表数据库访问层
+ *
+ * @author : http://njyunzhi.com
+ * @date : 2024-3-22
+ */
+@Mapper
+public interface TaAttachMapper extends BaseMapper<TaAttach> {
+
+}

src/main/java/com/lyg/tools/service/MessageSmBoxService.java

@@ -1,16 +0,0 @@
-package com.lyg.tools.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.lyg.tools.entity.MessageSmBox;
-
-/**
- * 消息表-mysql;(Message_sm_box)表服务接口
- *
- * @author : http://njyunzhi.com
- * @date : 2023-2-7
- */
-
-public interface MessageSmBoxService extends IService<MessageSmBox> {
-
-//    void warning(List<SysUser> list, TaTask taTask);
-}

src/main/java/com/lyg/tools/service/TaAttachService.java

@@ -0,0 +1,13 @@
+package com.lyg.tools.service;
+
+import com.lyg.tools.entity.TaAttach;
+
+/**
+ * 文章附件表;(ta_post_attach)表服务接口
+ *
+ * @author : http://njyunzhi.com
+ * @date : 2024-3-22
+ */
+public interface TaAttachService extends IBaseService<TaAttach> {
+
+}

src/main/java/com/lyg/tools/service/impl/MessageSmBoxServiceImpl.java

@@ -1,54 +0,0 @@
-package com.lyg.tools.service.impl;
-
-import com.baomidou.dynamic.datasource.annotation.DS;
-import com.lyg.tools.entity.MessageSmBox;
-import com.lyg.tools.mapper.MessageSmBoxMapper;
-import com.lyg.tools.service.MessageSmBoxService;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Service;
-
-/**
- * 消息表-mysql;(Message_sm_box)表服务实现类
- *
- * @author : http://www.chiner.pro
- * @date : 2023-2-7
- */
-@Service
-@DS("mysql")
-public class MessageSmBoxServiceImpl extends BaseServiceImpl<MessageSmBoxMapper, MessageSmBox> implements MessageSmBoxService {
-
-    public static final int CHN_HX = 2;
-    @Value("${yz.task.message.appid}")
-    String appid;
-    @Value("${yz.task.message.template}")
-    String template;
-
-//    @Async
-//    @Override
-//    public void warning(List<SysUser> list, TaTask taTask) {
-//        if (null == list || list.size() == 0) {
-//            return;
-//        }
-//
-//        LocalDateTime now = LocalDateTime.now();
-//
-//        List<MessageSmBox> messageList = new ArrayList<>();
-//        for (SysUser user : list) {
-//            MessageSmBox message = new MessageSmBox();
-//
-//            String name = user.getName();
-//            String taskTitle = taTask.getTitle();
-//            String msg = template.replace("{name}", name).replace("{taskTitle}", taskTitle);
-//            message.setMessage(msg);
-//            message.setPhone(user.getPhone());
-//            message.setAppid(appid);
-//            message.setChn(CHN_HX);
-//            message.setUser(user.getHxId());
-//            message.setDataDate(now);
-//            message.setRemark(null);
-//            messageList.add(message);
-//        }
-//
-//        saveBatch(messageList);
-//    }
-}

src/main/java/com/lyg/tools/service/impl/TaAttachServiceImpl.java

@@ -0,0 +1,17 @@
+package com.lyg.tools.service.impl;
+
+import com.lyg.tools.entity.TaAttach;
+import com.lyg.tools.mapper.TaAttachMapper;
+import com.lyg.tools.service.TaAttachService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 文章附件表;(ta_post_attach)表服务实现类
+ *
+ * @author : http://www.chiner.pro
+ * @date : 2024-3-22
+ */
+@Service
+public class TaAttachServiceImpl extends BaseServiceImpl<TaAttachMapper, TaAttach> implements TaAttachService {
+
+}

src/resources/application.yml

@@ -1,5 +1,5 @@
 server:
-  port: 7200
+  port: 7201
   servlet:
     context-path: /api
 
@@ -12,22 +12,13 @@ spring:
       max-file-size: 1024MB
       max-request-size: 1024MB
   datasource:
-    dynamic:
-      primary: oracle
-      datasource:
-        oracle:
-          url: jdbc:oracle:thin:@192.168.89.147:1521:orcl
-          username: schedule_task
-          password: schedule_task@ABCD123
-          driver-class-name: oracle.jdbc.OracleDriver
-        mysql:
-          url: jdbc:mysql://192.168.89.10:3306/civilizedcity?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&useSSL=false&allowPublicKeyRetrieval=true&autoReconnect=true
-          username: civilizedcity
-          password: civilizedcity@ABCD1234
-          driver-class-name: com.mysql.cj.jdbc.Driver
+    url: jdbc:mysql://192.168.89.10:3306/cms?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&useSSL=false&allowPublicKeyRetrieval=true&autoReconnect=true
+    username: cms
+    password: cms@1234
+    driver-class-name: com.mysql.cj.jdbc.Driver
 
-      hikari:
-        max-pool-size: 3  # 最大连接池数
+    hikari:
+      max-pool-size: 3  # 最大连接池数
 
 
   # 配置 Redis 连接

src/resources/mapper/MessageSmBoxMapper.xml → src/resources/mapper/TaAttachMapper.xml

@@ -1,6 +1,6 @@
 <?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="com.lyg.tools.mapper.MessageSmBoxMapper">
-
+<mapper namespace="com.lyg.tools.mapper.TaAttachMapper">
+    
 </mapper>