Merge branch 'dev' of gitee.com:xiejs666/RuoYi-Cloud into master

README.md

@@ -12,6 +12,7 @@
 ## 平台简介
 
 若依是一套全部开源的快速开发平台，毫无保留给个人及企业免费使用。
+(xjs专用版)
 
 * 采用前后端分离的模式，微服务版本前端(基于 [RuoYi-Vue](https://gitee.com/y_project/RuoYi-Vue))。
 * 后端采用Spring Boot、Spring Cloud & Alibaba。

bin/clean.bat

@@ -1,12 +0,0 @@
-@echo off
-echo.
-echo [信息] 清理工程target生成路径。
-echo.
-
-%~d0
-cd %~dp0
-
-cd ..
-call mvn clean
-
-pause

bin/package.bat

@@ -1,12 +0,0 @@
-@echo off
-echo.
-echo [信息] 打包Web工程，生成war/jar包文件。
-echo.
-
-%~d0
-cd %~dp0
-
-cd ..
-call mvn clean package -Dmaven.test.skip=true
-
-pause

bin/run-auth.bat

@@ -1,14 +0,0 @@
-@echo off
-echo.
-echo [信息] 使用Jar命令运行Auth工程。
-echo.
-
-cd %~dp0
-cd ../ruoyi-auth/target
-
-set JAVA_OPTS=-Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m
-
-java -Dfile.encoding=utf-8 %JAVA_OPTS% -jar ruoyi-auth.jar
-
-cd bin
-pause

bin/run-gateway.bat

@@ -1,14 +0,0 @@
-@echo off
-echo.
-echo [信息] 使用Jar命令运行Gateway工程。
-echo.
-
-cd %~dp0
-cd ../ruoyi-gateway/target
-
-set JAVA_OPTS=-Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m
-
-java -Dfile.encoding=utf-8 %JAVA_OPTS% -jar ruoyi-gateway.jar
-
-cd bin
-pause

bin/run-modules-file.bat

@@ -1,14 +0,0 @@
-@echo off
-echo.
-echo [信息] 使用Jar命令运行Modules-File工程。
-echo.
-
-cd %~dp0
-cd ../ruoyi-modules/ruoyi-file/target
-
-set JAVA_OPTS=-Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m
-
-java -Dfile.encoding=utf-8 %JAVA_OPTS% -jar ruoyi-modules-file.jar
-
-cd bin
-pause

bin/run-modules-gen.bat

@@ -1,14 +0,0 @@
-@echo off
-echo.
-echo [信息] 使用Jar命令运行Modules-Gen工程。
-echo.
-
-cd %~dp0
-cd ../ruoyi-modules/ruoyi-gen/target
-
-set JAVA_OPTS=-Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m
-
-java -Dfile.encoding=utf-8 %JAVA_OPTS% -jar ruoyi-modules-gen.jar
-
-cd bin
-pause

bin/run-modules-job.bat

@@ -1,14 +0,0 @@
-@echo off
-echo.
-echo [信息] 使用Jar命令运行Modules-Job工程。
-echo.
-
-cd %~dp0
-cd ../ruoyi-modules/ruoyi-job/target
-
-set JAVA_OPTS=-Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m
-
-java -Dfile.encoding=utf-8 %JAVA_OPTS% -jar ruoyi-modules-job.jar
-
-cd bin
-pause

bin/run-modules-system.bat

@@ -1,14 +0,0 @@
-@echo off
-echo.
-echo [信息] 使用Jar命令运行Modules-System工程。
-echo.
-
-cd %~dp0
-cd ../ruoyi-modules/ruoyi-system/target
-
-set JAVA_OPTS=-Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m
-
-java -Dfile.encoding=utf-8 %JAVA_OPTS% -jar ruoyi-modules-system.jar
-
-cd bin
-pause

bin/run-monitor.bat

@@ -1,14 +0,0 @@
-@echo off
-echo.
-echo [信息] 使用Jar命令运行Monitor工程。
-echo.
-
-cd %~dp0
-cd ../ruoyi-visual/ruoyi-monitor/target
-
-set JAVA_OPTS=-Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m
-
-java -Dfile.encoding=utf-8 %JAVA_OPTS% -jar ruoyi-visual-monitor.jar
-
-cd bin
-pause

pom.xml

@@ -17,7 +17,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>1.8</java.version>
-        <spring-boot.version>2.5.8</spring-boot.version>
+        <spring-boot.version>2.5.6</spring-boot.version>
         <spring-cloud.version>2020.0.4</spring-cloud.version>
         <spring-cloud-alibaba.version>2021.1</spring-cloud-alibaba.version>
         <alibaba.nacos.version>2.0.3</alibaba.nacos.version>
@@ -40,7 +40,13 @@
         <common-pool.version>2.10.0</common-pool.version>
         <commons-collections.version>3.2.2</commons-collections.version>
         <transmittable-thread-local.version>2.12.2</transmittable-thread-local.version>
-        <log4j2.version>2.17.1</log4j2.version>
+        <log4j2.version>2.17.0</log4j2.version>
+
+        <!--xjs加的-->
+        <knife4j.version>3.0.3</knife4j.version>
+        <hutool.version>5.7.17</hutool.version>
+        <mybatisplus.version>3.4.3.4</mybatisplus.version>
+
     </properties>
 
     <!-- 依赖声明 -->
@@ -270,6 +276,7 @@
         <module>ruoyi-modules</module>
         <module>ruoyi-api</module>
         <module>ruoyi-common</module>
+        <module>xjs-business</module>
     </modules>
     <packaging>pom</packaging>
 

ruoyi-api/ruoyi-api-system/src/main/java/com/xjs/business/api/RemoteCopyWritingFeign.java

@@ -0,0 +1,28 @@
+package com.xjs.business.api;
+
+import com.ruoyi.common.core.constant.ServiceNameConstants;
+import com.ruoyi.common.core.domain.R;
+import com.xjs.business.api.domain.CopyWriting;
+import com.xjs.business.api.factory.RemoteCopyWritingFactory;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+
+/**
+ * @author xiejs
+ * @desc RPC远程调用文案接口服务
+ * @create 2021-12-27
+ */
+@FeignClient(contextId = "remoteCopyWritingFeign",
+        value = ServiceNameConstants.BUSINESS_OPENAPI_SERVICE,
+        fallbackFactory = RemoteCopyWritingFactory.class)
+@FunctionalInterface
+public interface RemoteCopyWritingFeign {
+    /**
+     * 获取文案
+     *
+     * @return 结果
+     */
+    @GetMapping(value = "/copyWriting/forPRC")
+    R<CopyWriting> copyWriting();
+
+}

ruoyi-api/ruoyi-api-system/src/main/java/com/xjs/business/api/RemoteTranDIctFeign.java

@@ -0,0 +1,24 @@
+package com.xjs.business.api;
+
+import com.ruoyi.common.core.constant.ServiceNameConstants;
+import com.ruoyi.common.core.domain.R;
+import com.xjs.business.api.domain.TranslationVo;
+import com.xjs.business.api.factory.RemoteTranDictFactory;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+/**
+ * @author xiejs
+ * @desc  rpc调用翻译字典接口
+ * @create 2021-12-30
+ */
+@FeignClient(contextId = "remoteTranDictFeign",
+        value = ServiceNameConstants.BUSINESS_OPENAPI_SERVICE,
+        fallbackFactory = RemoteTranDictFactory.class)
+public interface RemoteTranDIctFeign {
+
+    @GetMapping(value = "/tranDict/tranDictForRPC")
+    R<TranslationVo> tranDict(@RequestParam("content") String content);
+
+}

ruoyi-api/ruoyi-api-system/src/main/java/com/xjs/business/api/RemoteTranslationFeign.java

@@ -0,0 +1,25 @@
+package com.xjs.business.api;
+
+import com.ruoyi.common.core.constant.ServiceNameConstants;
+import com.ruoyi.common.core.domain.R;
+import com.xjs.business.api.domain.TranslationVo;
+import com.xjs.business.api.factory.RemoteTranslationFactory;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+/**
+ * @author xiejs
+ * @desc  rpc远程调用其他服务翻译接口
+ * @create 2021-12-29
+ */
+@FeignClient(contextId = "remoteTranslationFeign",
+        value = ServiceNameConstants.BUSINESS_OPENAPI_SERVICE,
+        fallbackFactory = RemoteTranslationFactory.class)
+public interface RemoteTranslationFeign {
+
+    @GetMapping(value = "/translation/forRPC")
+                                    //get请求传递单个参数需要此注解
+    R<TranslationVo> translation(@RequestParam("content") String content);
+
+}

ruoyi-api/ruoyi-api-system/src/main/java/com/xjs/business/api/domain/CopyWriting.java

@@ -0,0 +1,65 @@
+package com.xjs.business.api.domain;
+
+import java.io.Serializable;
+
+/**
+ * @author xiejs
+ * @desc  文案实体类
+ * @create 2021-12-27
+ */
+public class CopyWriting implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private Long id;
+
+    /** 文案内容 */
+    private String content;
+
+    /** 文案来源 */
+    private String source;
+
+    private String createTime;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getContent() {
+        return content;
+    }
+
+    public void setContent(String content) {
+        this.content = content;
+    }
+
+    public String getSource() {
+        return source;
+    }
+
+    public void setSource(String source) {
+        this.source = source;
+    }
+
+    public String getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(String createTime) {
+        this.createTime = createTime;
+    }
+
+    @Override
+    public String toString() {
+        return "CopyWriting{" +
+                "id=" + id +
+                ", content='" + content + '\'' +
+                ", source='" + source + '\'' +
+                ", createTime='" + createTime + '\'' +
+                '}';
+    }
+}

ruoyi-api/ruoyi-api-system/src/main/java/com/xjs/business/api/domain/TranslationVo.java

@@ -0,0 +1,96 @@
+package com.xjs.business.api.domain;
+
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author xiejs
+ * @desc  翻译实体类VO
+ * @create 2021-12-25
+ */
+public class TranslationVo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 源语言
+     */
+    private String from;
+
+    /**
+     * 目标语言
+     */
+    private String to;
+
+    /**
+     * 翻译结果
+     */
+    private List<Map<String, String>> transResult;
+
+    /**
+     * 是否错误
+     */
+    private Long errorCode;
+
+
+    /**
+     * 运行时间，单位毫秒
+     */
+    private Long elapsedTime;
+
+
+    /**
+     * 语言类型
+     */
+    private String type;
+
+    public String getFrom() {
+        return from;
+    }
+
+    public void setFrom(String from) {
+        this.from = from;
+    }
+
+    public String getTo() {
+        return to;
+    }
+
+    public void setTo(String to) {
+        this.to = to;
+    }
+
+    public List<Map<String, String>> getTransResult() {
+        return transResult;
+    }
+
+    public void setTransResult(List<Map<String, String>> transResult) {
+        this.transResult = transResult;
+    }
+
+    public Long getErrorCode() {
+        return errorCode;
+    }
+
+    public void setErrorCode(Long errorCode) {
+        this.errorCode = errorCode;
+    }
+
+    public Long getElapsedTime() {
+        return elapsedTime;
+    }
+
+    public void setElapsedTime(Long elapsedTime) {
+        this.elapsedTime = elapsedTime;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+}

ruoyi-api/ruoyi-api-system/src/main/java/com/xjs/business/api/factory/RemoteCopyWritingFactory.java

@@ -0,0 +1,25 @@
+package com.xjs.business.api.factory;
+
+import com.ruoyi.common.core.domain.R;
+import com.xjs.business.api.RemoteCopyWritingFeign;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.cloud.openfeign.FallbackFactory;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author xiejs
+ * @desc  文案rpc降级服务处理
+ * @create 2021-12-27
+ */
+@Component
+public class RemoteCopyWritingFactory implements FallbackFactory<RemoteCopyWritingFeign> {
+
+    private static final Logger log = LoggerFactory.getLogger(RemoteCopyWritingFactory.class);
+
+    @Override
+    public RemoteCopyWritingFeign create(Throwable cause) {
+        log.error("api模块文案服务调用失败:{}", cause.getMessage());
+        return () -> R.fail("文案服务调用失败" + cause.getMessage());
+    }
+}

ruoyi-api/ruoyi-api-system/src/main/java/com/xjs/business/api/factory/RemoteTranDictFactory.java

@@ -0,0 +1,24 @@
+package com.xjs.business.api.factory;
+
+import com.ruoyi.common.core.domain.R;
+import com.xjs.business.api.RemoteTranDIctFeign;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.cloud.openfeign.FallbackFactory;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author xiejs
+ * @desc  翻译字段服务降级处理
+ * @create 2021-12-30
+ */
+@Component
+public class RemoteTranDictFactory implements FallbackFactory<RemoteTranDIctFeign> {
+    private static final Logger log = LoggerFactory.getLogger(RemoteTranDictFactory.class);
+
+    @Override
+    public RemoteTranDIctFeign create(Throwable cause) {
+        log.error("api模块文案服务调用失败:{}", cause.getMessage());
+        return content -> R.fail("文案服务调用失败" + cause.getMessage());
+    }
+}

ruoyi-api/ruoyi-api-system/src/main/java/com/xjs/business/api/factory/RemoteTranslationFactory.java

@@ -0,0 +1,25 @@
+package com.xjs.business.api.factory;
+
+import com.ruoyi.common.core.domain.R;
+import com.xjs.business.api.RemoteTranslationFeign;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.cloud.openfeign.FallbackFactory;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author xiejs
+ * @desc  调用翻译接口降级处理
+ * @create 2021-12-29
+ */
+@Component
+public class RemoteTranslationFactory implements FallbackFactory<RemoteTranslationFeign> {
+
+    private static final Logger log = LoggerFactory.getLogger(RemoteTranslationFactory.class);
+
+    @Override
+    public RemoteTranslationFeign create(Throwable cause) {
+        log.error("api模块翻译服务调用失败:{}", cause.getMessage());
+        return content -> R.fail("翻译服务调用失败" + cause.getMessage());
+    }
+}

ruoyi-api/ruoyi-api-system/src/main/java/com/xjs/business/warning/RemoteWarningCRUDFeign.java

@@ -0,0 +1,39 @@
+package com.xjs.business.warning;
+
+import com.ruoyi.common.core.constant.ServiceNameConstants;
+import com.ruoyi.common.core.domain.R;
+import com.xjs.business.warning.domain.ApiRecord;
+import com.xjs.business.warning.factory.RemoteWarningCRUDFactory;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.cloud.openfeign.SpringQueryMap;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.List;
+
+/**
+ * @author xiejs
+ * @desc 远程rpc调用预警服务crud接口
+ * @create 2021-12-31
+ */
+@FeignClient(contextId = "remoteWarningCRUDFeign",
+        value = ServiceNameConstants.BUSINESS_WARNING_SERVICE,
+        fallbackFactory = RemoteWarningCRUDFactory.class)
+public interface RemoteWarningCRUDFeign {
+
+    @PostMapping("apiwarning")
+    public R<ApiRecord> saveApiRecordForRPC(@RequestBody ApiRecord apiRecord);
+
+
+    @PutMapping("apiwarning")
+    public R<ApiRecord> updateApiRecordForRPC(@RequestBody ApiRecord apiRecord);
+
+    @GetMapping("apiwarning")
+    R<List<ApiRecord>> selectApiRecordListForRPC(@SpringQueryMap ApiRecord apiRecord) ;
+
+
+
+
+}

ruoyi-api/ruoyi-api-system/src/main/java/com/xjs/business/warning/domain/ApiRecord.java

@@ -0,0 +1,113 @@
+package com.xjs.business.warning.domain;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author xiejs
+ * @desc  api记录实体类
+ * @create 2021-12-31
+ */
+public class ApiRecord implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /** 主键id */
+    private Long id;
+
+    /** api名称 */
+    private String apiName;
+
+    /** api地址 */
+    private String apiUrl;
+
+    /** api每天请求次数 */
+    private Long dayCount;
+
+    /**
+     * 请求耗费时间
+     */
+    private Integer requestTime;
+
+    /** api总请求次数 */
+    private Long totalCount;
+
+    /** api限制请求次数每天 */
+    private Long limitCount;
+
+    private Date createTime;
+
+    private Date updateTime;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getApiName() {
+        return apiName;
+    }
+
+    public void setApiName(String apiName) {
+        this.apiName = apiName;
+    }
+
+    public String getApiUrl() {
+        return apiUrl;
+    }
+
+    public void setApiUrl(String apiUrl) {
+        this.apiUrl = apiUrl;
+    }
+
+    public Long getTotalCount() {
+        return totalCount;
+    }
+
+    public void setTotalCount(Long totalCount) {
+        this.totalCount = totalCount;
+    }
+
+    public Long getLimitCount() {
+        return limitCount;
+    }
+
+    public void setLimitCount(Long limitCount) {
+        this.limitCount = limitCount;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public Integer getRequestTime() {
+        return requestTime;
+    }
+
+    public void setRequestTime(Integer requestTime) {
+        this.requestTime = requestTime;
+    }
+
+    public Long getDayCount() {
+        return dayCount;
+    }
+
+    public void setDayCount(Long dayCount) {
+        this.dayCount = dayCount;
+    }
+}

ruoyi-api/ruoyi-api-system/src/main/java/com/xjs/business/warning/factory/RemoteWarningCRUDFactory.java

@@ -0,0 +1,45 @@
+package com.xjs.business.warning.factory;
+
+import com.ruoyi.common.core.domain.R;
+import com.xjs.business.warning.RemoteWarningCRUDFeign;
+import com.xjs.business.warning.domain.ApiRecord;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.cloud.openfeign.FallbackFactory;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * @author xiejs
+ * @desc  调用预警服务降级处理
+ * @create 2021-12-31
+ */
+@Component
+public class RemoteWarningCRUDFactory implements FallbackFactory<RemoteWarningCRUDFeign> {
+
+    private static final Logger log = LoggerFactory.getLogger(RemoteWarningCRUDFactory.class);
+
+    @Override
+    public RemoteWarningCRUDFeign create(Throwable cause) {
+        return new RemoteWarningCRUDFeign() {
+            @Override
+            public R<ApiRecord> saveApiRecordForRPC(ApiRecord apiRecord) {
+                log.error("调用预警服务添加接口失败，执行降级处理----"+apiRecord.getApiName());
+                return R.fail();
+            }
+
+            @Override
+            public R<ApiRecord> updateApiRecordForRPC(ApiRecord apiRecord) {
+                log.error("调用预警服务修改接口失败，执行降级处理----"+apiRecord.getApiName());
+                return R.fail();
+            }
+
+            @Override
+            public R<List<ApiRecord>> selectApiRecordListForRPC(ApiRecord apiRecord) {
+                log.error("调用预警服务查询接口失败，执行降级处理----"+apiRecord.getApiName());
+                return R.fail();
+            }
+        };
+    }
+}

ruoyi-api/ruoyi-api-system/src/main/resources/rebel.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  This is the JRebel configuration file. It maps the running application to your IDE workspace, enabling JRebel reloading for this project.
+  Refer to https://manuals.jrebel.com/jrebel/standalone/config.html for more information.
+-->
+<application generated-by="intellij" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.zeroturnaround.com" xsi:schemaLocation="http://www.zeroturnaround.com http://update.zeroturnaround.com/jrebel/rebel-2_3.xsd">
+
+	<id>ruoyi-api-system</id>
+
+	<classpath>
+		<dir name="D:/Dev/IdeaPerject/GitHub/RuoYi-Cloud/ruoyi-api/ruoyi-api-system/target/classes">
+		</dir>
+	</classpath>
+
+</application>

ruoyi-auth/src/main/resources/bootstrap.yml

@@ -23,3 +23,5 @@ spring:
         # 共享配置
         shared-configs:
           - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+        #命名空间
+        namespace: xjs-666

ruoyi-auth/src/main/resources/rebel.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  This is the JRebel configuration file. It maps the running application to your IDE workspace, enabling JRebel reloading for this project.
+  Refer to https://manuals.jrebel.com/jrebel/standalone/config.html for more information.
+-->
+<application generated-by="intellij" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.zeroturnaround.com" xsi:schemaLocation="http://www.zeroturnaround.com http://update.zeroturnaround.com/jrebel/rebel-2_3.xsd">
+
+	<id>ruoyi-auth</id>
+
+	<classpath>
+		<dir name="D:/Dev/IdeaPerject/GitHub/RuoYi-Cloud/ruoyi-auth/target/classes">
+		</dir>
+	</classpath>
+
+</application>

ruoyi-common/ruoyi-common-core/pom.xml

@@ -125,6 +125,12 @@
             <artifactId>swagger-annotations</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-all</artifactId>
+            <version>${hutool.version}</version>
+        </dependency>
+
     </dependencies>
 
 </project>

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/ServiceNameConstants.java

@@ -21,4 +21,18 @@ public class ServiceNameConstants
      * 文件服务的serviceid
      */
     public static final String FILE_SERVICE = "ruoyi-file";
+
+    /**
+     * 第三方api业务服务的serviceid
+     */
+    public static final String BUSINESS_OPENAPI_SERVICE= "xjs-openapi" ;
+
+
+    /**
+     * 预警服务的serviceid
+     */
+    public static final String BUSINESS_WARNING_SERVICE= "xjs-warning" ;
+
+
+
 }

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/TableDataInfo.java

@@ -1,5 +1,8 @@
 package com.ruoyi.common.core.web.page;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
 import java.io.Serializable;
 import java.util.List;
 
@@ -8,20 +11,25 @@ import java.util.List;
  * 
  * @author ruoyi
  */
+@ApiModel(value = "表格分页数据对象")
 public class TableDataInfo implements Serializable
 {
     private static final long serialVersionUID = 1L;
 
     /** 总记录数 */
+    @ApiModelProperty("总记录数")
     private long total;
 
     /** 列表数据 */
+    @ApiModelProperty("列表数据")
     private List<?> rows;
 
     /** 消息状态码 */
+    @ApiModelProperty("消息状态码")
     private int code;
 
     /** 消息内容 */
+    @ApiModelProperty("消息内容")
     private String msg;
 
     /**

ruoyi-common/ruoyi-common-core/src/main/resources/rebel.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  This is the JRebel configuration file. It maps the running application to your IDE workspace, enabling JRebel reloading for this project.
+  Refer to https://manuals.jrebel.com/jrebel/standalone/config.html for more information.
+-->
+<application generated-by="intellij" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.zeroturnaround.com" xsi:schemaLocation="http://www.zeroturnaround.com http://update.zeroturnaround.com/jrebel/rebel-2_3.xsd">
+
+	<id>ruoyi-common-core</id>
+
+	<classpath>
+		<dir name="D:/Dev/IdeaPerject/GitHub/RuoYi-Cloud/ruoyi-common/ruoyi-common-core/target/classes">
+		</dir>
+	</classpath>
+
+</application>

ruoyi-common/ruoyi-common-datascope/src/main/resources/rebel.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  This is the JRebel configuration file. It maps the running application to your IDE workspace, enabling JRebel reloading for this project.
+  Refer to https://manuals.jrebel.com/jrebel/standalone/config.html for more information.
+-->
+<application generated-by="intellij" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.zeroturnaround.com" xsi:schemaLocation="http://www.zeroturnaround.com http://update.zeroturnaround.com/jrebel/rebel-2_3.xsd">
+
+	<id>ruoyi-common-datascope</id>
+
+	<classpath>
+		<dir name="D:/Dev/IdeaPerject/GitHub/RuoYi-Cloud/ruoyi-common/ruoyi-common-datascope/target/classes">
+		</dir>
+	</classpath>
+
+</application>

ruoyi-common/ruoyi-common-datasource/src/main/resources/rebel.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  This is the JRebel configuration file. It maps the running application to your IDE workspace, enabling JRebel reloading for this project.
+  Refer to https://manuals.jrebel.com/jrebel/standalone/config.html for more information.
+-->
+<application generated-by="intellij" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.zeroturnaround.com" xsi:schemaLocation="http://www.zeroturnaround.com http://update.zeroturnaround.com/jrebel/rebel-2_3.xsd">
+
+	<id>ruoyi-common-datasource</id>
+
+	<classpath>
+		<dir name="D:/Dev/IdeaPerject/GitHub/RuoYi-Cloud/ruoyi-common/ruoyi-common-datasource/target/classes">
+		</dir>
+	</classpath>
+
+</application>

ruoyi-common/ruoyi-common-log/src/main/resources/rebel.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  This is the JRebel configuration file. It maps the running application to your IDE workspace, enabling JRebel reloading for this project.
+  Refer to https://manuals.jrebel.com/jrebel/standalone/config.html for more information.
+-->
+<application generated-by="intellij" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.zeroturnaround.com" xsi:schemaLocation="http://www.zeroturnaround.com http://update.zeroturnaround.com/jrebel/rebel-2_3.xsd">
+
+	<id>ruoyi-common-log</id>
+
+	<classpath>
+		<dir name="D:/Dev/IdeaPerject/GitHub/RuoYi-Cloud/ruoyi-common/ruoyi-common-log/target/classes">
+		</dir>
+	</classpath>
+
+</application>

ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/service/RedisService.java

@@ -1,11 +1,5 @@
 package com.ruoyi.common.redis.service;
 
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.TimeUnit;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.BoundSetOperations;
 import org.springframework.data.redis.core.HashOperations;
@@ -13,64 +7,62 @@ import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.data.redis.core.ValueOperations;
 import org.springframework.stereotype.Component;
 
+import java.util.*;
+import java.util.concurrent.TimeUnit;
+
 /**
  * spring redis 工具类
  *
  * @author ruoyi
  **/
-@SuppressWarnings(value = { "unchecked", "rawtypes" })
+@SuppressWarnings(value = {"unchecked", "rawtypes"})
 @Component
-public class RedisService
+public class RedisService {
-{
     @Autowired
     public RedisTemplate redisTemplate;
 
     /**
      * 缓存基本的对象，Integer、String、实体类等
      *
-     * @param key 缓存的键值
+     * @param key   缓存的键值
      * @param value 缓存的值
      */
-    public <T> void setCacheObject(final String key, final T value)
+    public <T> void setCacheObject(final String key, final T value) {
-    {
         redisTemplate.opsForValue().set(key, value);
     }
 
     /**
      * 缓存基本的对象，Integer、String、实体类等
      *
-     * @param key 缓存的键值
+     * @param key      缓存的键值
-     * @param value 缓存的值
+     * @param value    缓存的值
-     * @param timeout 时间
+     * @param timeout  时间
      * @param timeUnit 时间颗粒度
      */
-    public <T> void setCacheObject(final String key, final T value, final Long timeout, final TimeUnit timeUnit)
+    public <T> void setCacheObject(final String key, final T value, final Long timeout, final TimeUnit timeUnit) {
-    {
         redisTemplate.opsForValue().set(key, value, timeout, timeUnit);
     }
 
     /**
      * 设置有效时间
      *
-     * @param key Redis键
+     * @param key     Redis键
      * @param timeout 超时时间
      * @return true=设置成功；false=设置失败
      */
-    public boolean expire(final String key, final long timeout)
+    public boolean expire(final String key, final long timeout) {
-    {
         return expire(key, timeout, TimeUnit.SECONDS);
     }
 
     /**
      * 设置有效时间
      *
-     * @param key Redis键
+     * @param key     Redis键
      * @param timeout 超时时间
-     * @param unit 时间单位
+     * @param unit    时间单位
      * @return true=设置成功；false=设置失败
      */
-    public boolean expire(final String key, final long timeout, final TimeUnit unit)
+    public boolean expire(final String key, final long timeout, final TimeUnit unit) {
-    {
         return redisTemplate.expire(key, timeout, unit);
     }
 
@@ -80,8 +72,7 @@ public class RedisService
      * @param key Redis键
      * @return 有效时间
      */
-    public long getExpire(final String key)
+    public long getExpire(final String key) {
-    {
         return redisTemplate.getExpire(key);
     }
 
@@ -91,8 +82,7 @@ public class RedisService
      * @param key 键
      * @return true 存在 false不存在
      */
-    public Boolean hasKey(String key)
+    public Boolean hasKey(String key) {
-    {
         return redisTemplate.hasKey(key);
     }
 
@@ -102,8 +92,7 @@ public class RedisService
      * @param key 缓存键值
      * @return 缓存键值对应的数据
      */
-    public <T> T getCacheObject(final String key)
+    public <T> T getCacheObject(final String key) {
-    {
         ValueOperations<String, T> operation = redisTemplate.opsForValue();
         return operation.get(key);
     }
@@ -113,8 +102,7 @@ public class RedisService
      *
      * @param key
      */
-    public boolean deleteObject(final String key)
+    public boolean deleteObject(final String key) {
-    {
         return redisTemplate.delete(key);
     }
 
@@ -124,20 +112,18 @@ public class RedisService
      * @param collection 多个对象
      * @return
      */
-    public long deleteObject(final Collection collection)
+    public long deleteObject(final Collection collection) {
-    {
         return redisTemplate.delete(collection);
     }
 
     /**
      * 缓存List数据
      *
-     * @param key 缓存的键值
+     * @param key      缓存的键值
      * @param dataList 待缓存的List数据
      * @return 缓存的对象
      */
-    public <T> long setCacheList(final String key, final List<T> dataList)
+    public <T> long setCacheList(final String key, final List<T> dataList) {
-    {
         Long count = redisTemplate.opsForList().rightPushAll(key, dataList);
         return count == null ? 0 : count;
     }
@@ -148,24 +134,21 @@ public class RedisService
      * @param key 缓存的键值
      * @return 缓存键值对应的数据
      */
-    public <T> List<T> getCacheList(final String key)
+    public <T> List<T> getCacheList(final String key) {
-    {
         return redisTemplate.opsForList().range(key, 0, -1);
     }
 
     /**
      * 缓存Set
      *
-     * @param key 缓存键值
+     * @param key     缓存键值
      * @param dataSet 缓存的数据
      * @return 缓存数据的对象
      */
-    public <T> BoundSetOperations<String, T> setCacheSet(final String key, final Set<T> dataSet)
+    public <T> BoundSetOperations<String, T> setCacheSet(final String key, final Set<T> dataSet) {
-    {
         BoundSetOperations<String, T> setOperation = redisTemplate.boundSetOps(key);
         Iterator<T> it = dataSet.iterator();
-        while (it.hasNext())
+        while (it.hasNext()) {
-        {
             setOperation.add(it.next());
         }
         return setOperation;
@@ -177,8 +160,7 @@ public class RedisService
      * @param key
      * @return
      */
-    public <T> Set<T> getCacheSet(final String key)
+    public <T> Set<T> getCacheSet(final String key) {
-    {
         return redisTemplate.opsForSet().members(key);
     }
 
@@ -188,8 +170,7 @@ public class RedisService
      * @param key
      * @param dataMap
      */
-    public <T> void setCacheMap(final String key, final Map<String, T> dataMap)
+    public <T> void setCacheMap(final String key, final Map<String, T> dataMap) {
-    {
         if (dataMap != null) {
             redisTemplate.opsForHash().putAll(key, dataMap);
         }
@@ -201,32 +182,29 @@ public class RedisService
      * @param key
      * @return
      */
-    public <T> Map<String, T> getCacheMap(final String key)
+    public <T> Map<String, T> getCacheMap(final String key) {
-    {
         return redisTemplate.opsForHash().entries(key);
     }
 
     /**
      * 往Hash中存入数据
      *
-     * @param key Redis键
+     * @param key   Redis键
-     * @param hKey Hash键
+     * @param hKey  Hash键
      * @param value 值
      */
-    public <T> void setCacheMapValue(final String key, final String hKey, final T value)
+    public <T> void setCacheMapValue(final String key, final String hKey, final T value) {
-    {
         redisTemplate.opsForHash().put(key, hKey, value);
     }
 
     /**
      * 获取Hash中的数据
      *
-     * @param key Redis键
+     * @param key  Redis键
      * @param hKey Hash键
      * @return Hash中的对象
      */
-    public <T> T getCacheMapValue(final String key, final String hKey)
+    public <T> T getCacheMapValue(final String key, final String hKey) {
-    {
         HashOperations<String, String, T> opsForHash = redisTemplate.opsForHash();
         return opsForHash.get(key, hKey);
     }
@@ -234,12 +212,11 @@ public class RedisService
     /**
      * 获取多个Hash中的数据
      *
-     * @param key Redis键
+     * @param key   Redis键
      * @param hKeys Hash键集合
      * @return Hash对象集合
      */
-    public <T> List<T> getMultiCacheMapValue(final String key, final Collection<Object> hKeys)
+    public <T> List<T> getMultiCacheMapValue(final String key, final Collection<Object> hKeys) {
-    {
         return redisTemplate.opsForHash().multiGet(key, hKeys);
     }
 
@@ -249,8 +226,18 @@ public class RedisService
      * @param pattern 字符串前缀
      * @return 对象列表
      */
-    public Collection<String> keys(final String pattern)
+    public Collection<String> keys(final String pattern) {
-    {
         return redisTemplate.keys(pattern);
     }
+
+
+    /**
+     * 删hash集合某个元素
+     * @author xjs
+     * @param key  redis键
+     * @param hkey hash键
+     */
+    public void dHashByKey(String key, String hkey) {
+        redisTemplate.opsForHash().delete(key, hkey);
+    }
 }

ruoyi-common/ruoyi-common-redis/src/main/resources/rebel.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  This is the JRebel configuration file. It maps the running application to your IDE workspace, enabling JRebel reloading for this project.
+  Refer to https://manuals.jrebel.com/jrebel/standalone/config.html for more information.
+-->
+<application generated-by="intellij" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.zeroturnaround.com" xsi:schemaLocation="http://www.zeroturnaround.com http://update.zeroturnaround.com/jrebel/rebel-2_3.xsd">
+
+	<id>ruoyi-common-redis</id>
+
+	<classpath>
+		<dir name="D:/Dev/IdeaPerject/GitHub/RuoYi-Cloud/ruoyi-common/ruoyi-common-redis/target/classes">
+		</dir>
+	</classpath>
+
+</application>

ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/EnableCustomConfig.java

@@ -1,17 +1,14 @@
 package com.ruoyi.common.security.annotation;
 
-import java.lang.annotation.Documented;
+import com.ruoyi.common.security.config.ApplicationConfig;
-import java.lang.annotation.ElementType;
+import com.ruoyi.common.security.feign.FeignAutoConfiguration;
-import java.lang.annotation.Inherited;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
 import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.EnableAspectJAutoProxy;
 import org.springframework.context.annotation.Import;
 import org.springframework.scheduling.annotation.EnableAsync;
-import com.ruoyi.common.security.config.ApplicationConfig;
+
-import com.ruoyi.common.security.feign.FeignAutoConfiguration;
+import java.lang.annotation.*;
 
 @Target(ElementType.TYPE)
 @Retention(RetentionPolicy.RUNTIME)
@@ -20,11 +17,13 @@ import com.ruoyi.common.security.feign.FeignAutoConfiguration;
 // 表示通过aop框架暴露该代理对象,AopContext能够访问
 @EnableAspectJAutoProxy(exposeProxy = true)
 // 指定要扫描的Mapper类的包的路径
-@MapperScan("com.ruoyi.**.mapper")
+@MapperScan({"com.ruoyi.**.mapper","com.xjs.**.mapper"})
 // 开启线程异步执行
 @EnableAsync
 // 自动加载类
 @Import({ ApplicationConfig.class, FeignAutoConfiguration.class })
+//自定义bean扫描，添加xjs路径下的bean
+@ComponentScan(basePackages = {"com.ruoyi","com.xjs"})
 public @interface EnableCustomConfig
 {
 

ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/EnableRyFeignClients.java

@@ -17,7 +17,7 @@ public @interface EnableRyFeignClients
 {
     String[] value() default {};
 
-    String[] basePackages() default { "com.ruoyi" };
+    String[] basePackages() default { "com.ruoyi" ,"com.xjs"};
 
     Class<?>[] basePackageClasses() default {};
 

ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/service/TokenProperties.java

@@ -0,0 +1,45 @@
+package com.ruoyi.common.security.service;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author xiejs
+ * @desc  token相关配置
+ * @create 2021-12-30
+ */
+@Service
+@ConfigurationProperties(prefix = "jwt")
+public class TokenProperties {
+
+
+    private Long expireTime;
+
+    private String loginTokenKey;
+
+    private Long refreshTime;
+
+    public Long getExpireTime() {
+        return expireTime;
+    }
+
+    public void setExpireTime(Long expireTime) {
+        this.expireTime = expireTime;
+    }
+
+    public String getLoginTokenKey() {
+        return loginTokenKey;
+    }
+
+    public void setLoginTokenKey(String loginTokenKey) {
+        this.loginTokenKey = loginTokenKey;
+    }
+
+    public Long getRefreshTime() {
+        return refreshTime;
+    }
+
+    public void setRefreshTime(Long refreshTime) {
+        this.refreshTime = refreshTime;
+    }
+}

ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/service/TokenService.java

@@ -1,11 +1,5 @@
 package com.ruoyi.common.security.service;
 
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
-import javax.servlet.http.HttpServletRequest;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
 import com.ruoyi.common.core.constant.CacheConstants;
 import com.ruoyi.common.core.constant.SecurityConstants;
 import com.ruoyi.common.core.utils.IdUtils;
@@ -16,6 +10,14 @@ import com.ruoyi.common.core.utils.ip.IpUtils;
 import com.ruoyi.common.redis.service.RedisService;
 import com.ruoyi.common.security.utils.SecurityUtils;
 import com.ruoyi.system.api.model.LoginUser;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
 
 /**
  * token验证处理
@@ -23,26 +25,28 @@ import com.ruoyi.system.api.model.LoginUser;
  * @author ruoyi
  */
 @Component
-public class TokenService
+public class TokenService {
-{
     @Autowired
     private RedisService redisService;
 
-    protected static final long MILLIS_SECOND = 1000;
+    protected final long MILLIS_SECOND = 1000;
+
+    protected final long MILLIS_MINUTE = 60 * MILLIS_SECOND;
 
-    protected static final long MILLIS_MINUTE = 60 * MILLIS_SECOND;
+    @Value("${jwt.expireTime}")
+    private long expireTime;
 
-    private final static long expireTime = CacheConstants.EXPIRATION;
+    private static final String ACCESS_TOKEN = CacheConstants.LOGIN_TOKEN_KEY;
 
-    private final static String ACCESS_TOKEN = CacheConstants.LOGIN_TOKEN_KEY;
+    @Value("${jwt.refreshTime}")
+    private long refreshTime;
 
-    private final static Long MILLIS_MINUTE_TEN = CacheConstants.REFRESH_TIME * MILLIS_MINUTE;
+    private final Long MILLIS_MINUTE_TEN = refreshTime * MILLIS_MINUTE;
 
     /**
      * 创建令牌
      */
-    public Map<String, Object> createToken(LoginUser loginUser)
+    public Map<String, Object> createToken(LoginUser loginUser) {
-    {
         String token = IdUtils.fastUUID();
         Long userId = loginUser.getSysUser().getUserId();
         String userName = loginUser.getSysUser().getUserName();
@@ -70,8 +74,7 @@ public class TokenService
      *
      * @return 用户信息
      */
-    public LoginUser getLoginUser()
+    public LoginUser getLoginUser() {
-    {
         return getLoginUser(ServletUtils.getRequest());
     }
 
@@ -80,8 +83,7 @@ public class TokenService
      *
      * @return 用户信息
      */
-    public LoginUser getLoginUser(HttpServletRequest request)
+    public LoginUser getLoginUser(HttpServletRequest request) {
-    {
         // 获取请求携带的令牌
         String token = SecurityUtils.getToken(request);
         return getLoginUser(token);
@@ -92,20 +94,15 @@ public class TokenService
      *
      * @return 用户信息
      */
-    public LoginUser getLoginUser(String token)
+    public LoginUser getLoginUser(String token) {
-    {
         LoginUser user = null;
-        try
+        try {
-        {
+            if (StringUtils.isNotEmpty(token)) {
-            if (StringUtils.isNotEmpty(token))
-            {
                 String userkey = JwtUtils.getUserKey(token);
                 user = redisService.getCacheObject(getTokenKey(userkey));
                 return user;
             }
-        }
+        } catch (Exception e) {
-        catch (Exception e)
-        {
         }
         return user;
     }
@@ -113,10 +110,8 @@ public class TokenService
     /**
      * 设置用户身份信息
      */
-    public void setLoginUser(LoginUser loginUser)
+    public void setLoginUser(LoginUser loginUser) {
-    {
+        if (StringUtils.isNotNull(loginUser) && StringUtils.isNotEmpty(loginUser.getToken())) {
-        if (StringUtils.isNotNull(loginUser) && StringUtils.isNotEmpty(loginUser.getToken()))
-        {
             refreshToken(loginUser);
         }
     }
@@ -124,10 +119,8 @@ public class TokenService
     /**
      * 删除用户缓存信息
      */
-    public void delLoginUser(String token)
+    public void delLoginUser(String token) {
-    {
+        if (StringUtils.isNotEmpty(token)) {
-        if (StringUtils.isNotEmpty(token))
-        {
             String userkey = JwtUtils.getUserKey(token);
             redisService.deleteObject(getTokenKey(userkey));
         }
@@ -138,12 +131,10 @@ public class TokenService
      *
      * @param loginUser
      */
-    public void verifyToken(LoginUser loginUser)
+    public void verifyToken(LoginUser loginUser) {
-    {
         long expireTime = loginUser.getExpireTime();
         long currentTime = System.currentTimeMillis();
-        if (expireTime - currentTime <= MILLIS_MINUTE_TEN)
+        if (expireTime - currentTime <= MILLIS_MINUTE_TEN) {
-        {
             refreshToken(loginUser);
         }
     }
@@ -153,8 +144,7 @@ public class TokenService
      *
      * @param loginUser 登录信息
      */
-    public void refreshToken(LoginUser loginUser)
+    public void refreshToken(LoginUser loginUser) {
-    {
         loginUser.setLoginTime(System.currentTimeMillis());
         loginUser.setExpireTime(loginUser.getLoginTime() + expireTime * MILLIS_MINUTE);
         // 根据uuid将loginUser缓存
@@ -162,8 +152,7 @@ public class TokenService
         redisService.setCacheObject(userKey, loginUser, expireTime, TimeUnit.MINUTES);
     }
 
-    private String getTokenKey(String token)
+    private String getTokenKey(String token) {
-    {
         return ACCESS_TOKEN + token;
     }
 }

ruoyi-common/ruoyi-common-security/src/main/resources/rebel.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  This is the JRebel configuration file. It maps the running application to your IDE workspace, enabling JRebel reloading for this project.
+  Refer to https://manuals.jrebel.com/jrebel/standalone/config.html for more information.
+-->
+<application generated-by="intellij" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.zeroturnaround.com" xsi:schemaLocation="http://www.zeroturnaround.com http://update.zeroturnaround.com/jrebel/rebel-2_3.xsd">
+
+	<id>ruoyi-common-security</id>
+
+	<classpath>
+		<dir name="D:/Dev/IdeaPerject/GitHub/RuoYi-Cloud/ruoyi-common/ruoyi-common-security/target/classes">
+		</dir>
+	</classpath>
+
+</application>

ruoyi-common/ruoyi-common-swagger/pom.xml

@@ -15,6 +15,10 @@
         ruoyi-common-swagger系统接口
     </description>
 
+    <properties>
+    </properties>
+
+
 	<dependencies>
 
         <!-- SpringBoot Web -->
@@ -23,11 +27,10 @@
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
 
-        <!-- Swagger -->
         <dependency>
-            <groupId>io.springfox</groupId>
+            <groupId>com.github.xiaoymin</groupId>
-            <artifactId>springfox-swagger2</artifactId>
+            <artifactId>knife4j-spring-boot-starter</artifactId>
-            <version>${swagger.fox.version}</version>
+            <version>${knife4j.version}</version>
         </dependency>
 
 	</dependencies>

ruoyi-common/ruoyi-common-swagger/src/main/resources/rebel.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  This is the JRebel configuration file. It maps the running application to your IDE workspace, enabling JRebel reloading for this project.
+  Refer to https://manuals.jrebel.com/jrebel/standalone/config.html for more information.
+-->
+<application generated-by="intellij" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.zeroturnaround.com" xsi:schemaLocation="http://www.zeroturnaround.com http://update.zeroturnaround.com/jrebel/rebel-2_3.xsd">
+
+	<id>ruoyi-common-swagger</id>
+
+	<classpath>
+		<dir name="D:/Dev/IdeaPerject/GitHub/RuoYi-Cloud/ruoyi-common/ruoyi-common-swagger/target/classes">
+		</dir>
+	</classpath>
+
+</application>

ruoyi-gateway/pom.xml

@@ -72,9 +72,9 @@
 
         <!-- Swagger -->
         <dependency>
-            <groupId>io.springfox</groupId>
+            <groupId>com.github.xiaoymin</groupId>
-            <artifactId>springfox-swagger-ui</artifactId>
+            <artifactId>knife4j-spring-ui</artifactId>
-            <version>${swagger.fox.version}</version>
+            <version>${knife4j.version}</version>
         </dependency>
         <dependency>
             <groupId>io.springfox</groupId>

ruoyi-gateway/src/main/resources/bootstrap.yml

@@ -25,6 +25,8 @@ spring:
         # 共享配置
         shared-configs:
           - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+        #命名空间
+        namespace: xjs-666
     sentinel:
       # 取消控制台懒加载
       eager: true

ruoyi-gateway/src/main/resources/rebel.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  This is the JRebel configuration file. It maps the running application to your IDE workspace, enabling JRebel reloading for this project.
+  Refer to https://manuals.jrebel.com/jrebel/standalone/config.html for more information.
+-->
+<application generated-by="intellij" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.zeroturnaround.com" xsi:schemaLocation="http://www.zeroturnaround.com http://update.zeroturnaround.com/jrebel/rebel-2_3.xsd">
+
+	<id>ruoyi-gateway</id>
+
+	<classpath>
+		<dir name="D:/Dev/IdeaPerject/GitHub/RuoYi-Cloud/ruoyi-gateway/target/classes">
+		</dir>
+	</classpath>
+
+</application>

ruoyi-modules/ruoyi-file/src/main/resources/bootstrap.yml

@@ -23,3 +23,5 @@ spring:
         # 共享配置
         shared-configs:
           - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+        #命名空间
+        namespace: xjs-666

ruoyi-modules/ruoyi-file/src/main/resources/rebel.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  This is the JRebel configuration file. It maps the running application to your IDE workspace, enabling JRebel reloading for this project.
+  Refer to https://manuals.jrebel.com/jrebel/standalone/config.html for more information.
+-->
+<application generated-by="intellij" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.zeroturnaround.com" xsi:schemaLocation="http://www.zeroturnaround.com http://update.zeroturnaround.com/jrebel/rebel-2_3.xsd">
+
+	<id>ruoyi-modules-file</id>
+
+	<classpath>
+		<dir name="D:/Dev/IdeaPerject/GitHub/RuoYi-Cloud/ruoyi-modules/ruoyi-file/target/classes">
+		</dir>
+	</classpath>
+
+</application>

ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/util/VelocityUtils.java

@@ -1,16 +1,17 @@
 package com.ruoyi.gen.util;
 
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import org.apache.velocity.VelocityContext;
 import com.alibaba.fastjson.JSONObject;
 import com.ruoyi.common.core.constant.GenConstants;
 import com.ruoyi.common.core.utils.DateUtils;
 import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.gen.domain.GenTable;
 import com.ruoyi.gen.domain.GenTableColumn;
+import org.apache.velocity.VelocityContext;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
 
 /**
  * 模板工具类

ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap.yml

@@ -23,3 +23,5 @@ spring:
         # 共享配置
         shared-configs:
           - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+        #命名空间
+        namespace: xjs-666

ruoyi-modules/ruoyi-gen/src/main/resources/rebel.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  This is the JRebel configuration file. It maps the running application to your IDE workspace, enabling JRebel reloading for this project.
+  Refer to https://manuals.jrebel.com/jrebel/standalone/config.html for more information.
+-->
+<application generated-by="intellij" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.zeroturnaround.com" xsi:schemaLocation="http://www.zeroturnaround.com http://update.zeroturnaround.com/jrebel/rebel-2_3.xsd">
+
+	<id>ruoyi-modules-gen</id>
+
+	<classpath>
+		<dir name="D:/Dev/IdeaPerject/GitHub/RuoYi-Cloud/ruoyi-modules/ruoyi-gen/target/classes">
+		</dir>
+	</classpath>
+
+</application>

ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/task/RyTask.java

@@ -1,28 +0,0 @@
-package com.ruoyi.job.task;
-
-import org.springframework.stereotype.Component;
-import com.ruoyi.common.core.utils.StringUtils;
-
-/**
- * 定时任务调度测试
- * 
- * @author ruoyi
- */
-@Component("ryTask")
-public class RyTask
-{
-    public void ryMultipleParams(String s, Boolean b, Long l, Double d, Integer i)
-    {
-        System.out.println(StringUtils.format("执行多参方法： 字符串类型{}，布尔类型{}，长整型{}，浮点型{}，整形{}", s, b, l, d, i));
-    }
-
-    public void ryParams(String params)
-    {
-        System.out.println("执行有参方法：" + params);
-    }
-
-    public void ryNoParams()
-    {
-        System.out.println("执行无参方法");
-    }
-}

ruoyi-modules/ruoyi-job/src/main/java/com/xjs/job/task/CopyWritingTask.java

@@ -0,0 +1,41 @@
+package com.xjs.job.task;
+
+import cn.hutool.core.date.DateUtil;
+import com.ruoyi.common.core.domain.R;
+import com.xjs.business.api.RemoteCopyWritingFeign;
+import com.xjs.business.api.domain.CopyWriting;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.time.LocalDateTime;
+import java.time.temporal.ChronoUnit;
+
+/**
+ * @author xiejs
+ * @desc  调用文案定时任务
+ * @create 2021-12-27
+ */
+@Component("CopyWritingTask")
+public class CopyWritingTask {
+
+    @Resource
+    private RemoteCopyWritingFeign remoteCopyWritingFeign;
+
+    private static final Logger log = LoggerFactory.getLogger(CopyWritingTask.class);
+
+    /**
+     * 任务执行
+     */
+    public void execute() {
+        LocalDateTime localDateTime1 = DateUtil.date().toLocalDateTime();
+        log.info("---------------文案定时任务Start-------------------");
+        R<CopyWriting> r = remoteCopyWritingFeign.copyWriting();
+        log.info("文案定时任务结果:code={},msg={},data={}",r.getCode(),r.getMsg(),r.getData());
+        LocalDateTime localDateTime2 = DateUtil.date().toLocalDateTime();
+        long between = ChronoUnit.MILLIS.between(localDateTime1, localDateTime2);
+        log.info("Job耗费时间:{}ms", between);
+        log.info("---------------文案定时任务end---------------------");
+    }
+}

ruoyi-modules/ruoyi-job/src/main/resources/bootstrap.yml

@@ -23,3 +23,5 @@ spring:
         # 共享配置
         shared-configs:
           - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+        #命名空间
+        namespace: xjs-666

ruoyi-modules/ruoyi-job/src/main/resources/rebel.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  This is the JRebel configuration file. It maps the running application to your IDE workspace, enabling JRebel reloading for this project.
+  Refer to https://manuals.jrebel.com/jrebel/standalone/config.html for more information.
+-->
+<application generated-by="intellij" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.zeroturnaround.com" xsi:schemaLocation="http://www.zeroturnaround.com http://update.zeroturnaround.com/jrebel/rebel-2_3.xsd">
+
+	<id>ruoyi-modules-job</id>
+
+	<classpath>
+		<dir name="D:/Dev/IdeaPerject/GitHub/RuoYi-Cloud/ruoyi-modules/ruoyi-job/target/classes">
+		</dir>
+	</classpath>
+
+</application>

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java

@@ -2,6 +2,7 @@ package com.ruoyi.system.service.impl;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
 import java.util.stream.Collectors;
 import javax.validation.Validator;
 import org.slf4j.Logger;
@@ -219,9 +220,10 @@ public class SysUserServiceImpl implements ISysUserService
     @Override
     public void checkUserAllowed(SysUser user)
     {
-        if (StringUtils.isNotNull(user.getUserId()) && user.isAdmin())
+        if (StringUtils.isNotNull(user.getUserId())&& user.isAdmin()) {
-        {
+            if("1".equals(user.getStatus())){
-            throw new ServiceException("不允许操作超级管理员用户");
+                throw new ServiceException("不允许停用超级管理员用户");
+            }
         }
     }
 

ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml

@@ -23,3 +23,5 @@ spring:
         # 共享配置
         shared-configs:
           - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+        #命名空间
+        namespace: xjs-666

ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml

@@ -39,6 +39,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 				and date_format(create_time,'%y%m%d') <= date_format(#{params.endTime},'%y%m%d')
 			</if>
 	    </where>
+	      order by  update_time desc ,dict_id desc
 	</select>
 	
 	<select id="selectDictTypeAll" resultMap="SysDictTypeResult">

ruoyi-modules/ruoyi-system/src/main/resources/rebel.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  This is the JRebel configuration file. It maps the running application to your IDE workspace, enabling JRebel reloading for this project.
+  Refer to https://manuals.jrebel.com/jrebel/standalone/config.html for more information.
+-->
+<application generated-by="intellij" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.zeroturnaround.com" xsi:schemaLocation="http://www.zeroturnaround.com http://update.zeroturnaround.com/jrebel/rebel-2_3.xsd">
+
+	<id>ruoyi-modules-system</id>
+
+	<classpath>
+		<dir name="D:/Dev/IdeaPerject/GitHub/RuoYi-Cloud/ruoyi-modules/ruoyi-system/target/classes">
+		</dir>
+	</classpath>
+
+</application>

ruoyi-ui/.env.development

@@ -1,5 +1,5 @@
 # 页面标题
-VUE_APP_TITLE = 若依管理系统
+VUE_APP_TITLE = 管理平台
 
 # 开发环境配置
 ENV = 'development'

ruoyi-ui/.env.production

@@ -1,5 +1,5 @@
 # 页面标题
-VUE_APP_TITLE = 若依管理系统
+VUE_APP_TITLE = 管理平台
 
 # 生产环境配置
 ENV = 'production'

ruoyi-ui/.env.staging

@@ -1,5 +1,5 @@
 # 页面标题
-VUE_APP_TITLE = 若依管理系统
+VUE_APP_TITLE = 管理平台
 
 NODE_ENV = production
 

ruoyi-ui/package.json

@@ -1,7 +1,7 @@
 {
   "name": "ruoyi",
   "version": "3.3.0",
-  "description": "若依管理系统",
+  "description": "管理平台",
   "author": "若依",
   "license": "MIT",
   "scripts": {

ruoyi-ui/src/api/business/english/word.js

@@ -0,0 +1,61 @@
+import request from '@/utils/request'
+
+// 查询英语单词列表
+export function listWord(query) {
+  return request({
+    url: '/english/word/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询英语单词详细
+export function getWord(id) {
+  return request({
+    url: '/english/word/' + id,
+    method: 'get'
+  })
+}
+
+export function getWordRPC(id) {
+  return request({
+    url: '/english/word/rpc/' + id,
+    method: 'get'
+  })
+}
+
+
+// 新增英语单词
+export function addWord(data) {
+  return request({
+    url: '/english/word',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改英语单词
+export function updateWord(data) {
+  return request({
+    url: '/english/word',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除英语单词
+export function delWord(id) {
+  return request({
+    url: '/english/word/' + id,
+    method: 'delete'
+  })
+}
+
+//查询收藏夹英语单词
+export function collectWord(query){
+  return request({
+    url: '/english/word/collect',
+    method: 'get',
+    params: query
+  })
+}

ruoyi-ui/src/api/business/monitor/service/monitorservice.js

@@ -0,0 +1,8 @@
+import request from '@/utils/request'
+
+// 登录方法
+export function getServiceMonitor() {
+  return request({
+    url: '/monitor/servicemonitor'
+  })
+}

ruoyi-ui/src/api/business/openapi/copywriting.js

@@ -0,0 +1,33 @@
+import request from '@/utils/request'
+
+// 查询文案api，通过api获取文案信息列表
+export function listCopyWriting(query) {
+  return request({
+    url: '/openapi/copyWriting/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询文案api，通过api获取文案信息详细
+export function getCopyWriting(id) {
+  return request({
+    url: '/openapi/copyWriting/' + id,
+    method: 'get'
+  })
+}
+
+// 删除文案api，通过api获取文案信息
+export function delCopyWriting(id) {
+  return request({
+    url: '/openapi/copyWriting/' + id,
+    method: 'delete'
+  })
+}
+// 删除重复文案信息
+export function delRepeatCopyWriting() {
+  return request({
+    url: '/openapi/copyWriting/Repeat/',
+    method: 'delete'
+  })
+}

ruoyi-ui/src/api/business/openapi/log.js

@@ -0,0 +1,26 @@
+import request from '@/utils/request'
+
+// 查询日志列表
+export function listLog(query) {
+  return request({
+    url: '/openapi/log/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询日志详细
+export function getLog(id) {
+  return request({
+    url: '/openapi/log/' + id,
+    method: 'get'
+  })
+}
+
+// 删除日志
+export function delLog(id) {
+  return request({
+    url: '/openapi/log/' + id,
+    method: 'delete'
+  })
+}

ruoyi-ui/src/api/business/openapi/oneenglish.js

@@ -0,0 +1,33 @@
+import request from '@/utils/request'
+
+// 查询英语一言列表
+export function listOneenglish(query) {
+  return request({
+    url: '/openapi/oneenglish/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询英语一言详细
+export function getOneenglish(id) {
+  return request({
+    url: '/openapi/oneenglish/' + id,
+    method: 'get'
+  })
+}
+
+// 删除英语一言
+export function delOneenglish(id) {
+  return request({
+    url: '/openapi/oneenglish/' + id,
+    method: 'delete'
+  })
+}
+
+//获取英语一言api接口
+export function getOneEnglishApi() {
+  return request({
+    url: '/openapi/oneenglish/getOneEnglish'
+  })
+}

ruoyi-ui/src/api/business/openapi/translation.js

@@ -0,0 +1,19 @@
+import request from '@/utils/request'
+
+// 翻译
+export function translation(query) {
+  return request({
+    url: '/openapi/translation',
+    method: 'post',
+    data: query
+  })
+}
+
+//获取文案
+export function getCopyWriting(query) {
+  return request({
+    url: '/openapi/copyWriting',
+    method: 'get',
+    data: query
+  })
+}

ruoyi-ui/src/api/business/warning/apiwarning.js

@@ -0,0 +1,28 @@
+import request from '@/utils/request'
+
+// 查询API预警列表
+export function listApiwarning(query) {
+  return request({
+    url: '/warning/apiwarning/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询API预警详细
+export function getApiwarning(id) {
+  return request({
+    url: '/warning/apiwarning/' + id,
+    method: 'get'
+  })
+}
+
+// 修改API预警
+export function updateApiwarning(data) {
+  return request({
+    url: '/warning/apiwarning/edit',
+    method: 'put',
+    data: data
+  })
+}
+

ruoyi-ui/src/layout/components/Sidebar/Logo.vue

@@ -35,7 +35,7 @@ export default {
   },
   data() {
     return {
-      title: '若依管理系统',
+      title: '管理平台',
       logo: logoImg
     }
   }

ruoyi-ui/src/views/business/english/word/collect.vue

@@ -0,0 +1,202 @@
+<template xmlns="http://www.w3.org/1999/html">
+  <div class="sea_main_con test-5" @mouseenter="onMouseover" @mouseleave="onMouseout">
+
+    <div class="infinite-list-wrapper">
+      <ul
+        class="list"
+        v-infinite-scroll="loadMore"
+        infinite-scroll-disabled="disabled"
+        infinite-scroll-distance="20"
+      >
+        <el-row>
+          <el-col :span="8" v-for="(say, index) in sayLists" :key="index" class="item-img">
+            <el-card :body-style="{ padding: '0px' }">
+              <div style="padding: 14px;">
+                <span>
+                  <el-tag type="info"
+                          size="medium"
+                  >英：{{ say.englishWord }}
+                  </el-tag>
+                </span>
+                <div class="bottom clearfix">
+                  <time class="time">
+                    <el-tag type="warning"
+                            size="medium"
+                            color=""
+                    >中：{{ say.chineseWord }}
+                    </el-tag>
+                  </time>
+                  <el-button icon="el-icon-search" circle class="button" @click="popoverVisibles(say.id)"></el-button>
+                </div>
+              </div>
+            </el-card>
+          </el-col>
+        </el-row>
+        <!--</li>-->
+      </ul>
+      <div class="load_icon">
+        <p v-if="loading">加载中<i class="el-icon-loading"/></p>
+        <p v-if="noMore">没有更多了~~~~</p>
+      </div>
+    </div>
+
+
+  </div>
+</template>
+
+<script>
+import {collectWord, getWordRPC} from "@/api/business/english/word";
+
+export default {
+  data() {
+    return {
+      loading: false,
+      seen: true,
+      currentDate: new Date(),
+      sayLists: [],
+      // 每次请求回来的数据的个数
+      everyList: 1,
+
+      queryParams: {
+        pageNum: 1,
+        pageSize: 21
+      },
+    }
+  },
+  computed: {
+    noMore() {
+      return this.everyList < 1;
+    },
+    disabled() {
+      return this.loading || this.noMore
+    }
+  },
+  methods: {
+    popoverVisibles(id) {
+      getWordRPC(id).then(res =>{
+        this.$notify({
+          title: res.data.englishWord,
+          message: res.data.content,
+          duration: 0
+        });
+      })
+    },
+
+    loadMore() {
+      this.loading = true
+      setTimeout(() => {
+        collectWord(this.queryParams).then((response) => {
+          console.log(response.data)
+          this.everyList = response.data.records.length;
+          for (var i = 0; i < response.data.records.length; i++) {
+            this.sayLists.push(response.data.records[i])
+          }
+        }, (error) => {
+
+        })
+        this.queryParams.pageNum += 1;
+        this.loading = false
+      }, 150)
+    },
+    onMouseover() {
+      this.seen = true;
+    },
+    onMouseout() {
+      this.seen = false;
+    }
+
+  }
+}
+</script>
+
+<style scoped class="scss">
+
+.item-img {
+  margin-left: 60px;
+  margin-top: 20px;
+}
+
+.sea_main_con {
+  width: 1002px;
+  height: 800px;
+  border: 1px #b8b7b7 solid;
+  overflow-y: scroll;
+  border-radius: 4px;
+  margin-left: auto;
+  margin-right: auto;
+  margin-top: 2px;
+  margin-bottom: 5px;
+}
+
+.test-5::-webkit-scrollbar {
+  /*滚动条整体样式*/
+  width: 10px; /*高宽分别对应横竖滚动条的尺寸*/
+  height: 1px;
+}
+
+.test-5::-webkit-scrollbar-thumb {
+  /*滚动条里面小方块*/
+  border-radius: 10px;
+  background-color: #999093;
+  background-image: -webkit-linear-gradient(
+    45deg,
+    rgba(255, 255, 255, 0.2) 25%,
+    transparent 25%,
+    transparent 50%,
+    rgba(255, 255, 255, 0.2) 50%,
+    rgba(255, 255, 255, 0.2) 75%,
+    transparent 75%,
+    transparent
+  );
+}
+
+.test-5::-webkit-scrollbar-track {
+  /*滚动条里面轨道*/
+  box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);
+  background: #ededed;
+  border-radius: 10px;
+}
+
+.time {
+  font-size: 13px;
+  color: #999;
+}
+
+.bottom {
+  margin-top: 13px;
+  line-height: 12px;
+}
+
+.button {
+  padding: 0;
+  float: right;
+}
+
+.image {
+  width: 100%;
+  display: block;
+}
+
+.clearfix:before,
+.clearfix:after {
+  display: table;
+  content: "";
+}
+
+.clearfix:after {
+  clear: both
+}
+
+.el-col-8 {
+  width: 24.3%;
+}
+
+.load_icon {
+  width: 100%;
+  text-align: center;
+}
+.load_icon p{
+  font-size: 10px;
+  color: #8492a6;
+}
+</style>

ruoyi-ui/src/views/business/english/word/index.vue

@@ -0,0 +1,541 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="英语单词" prop="englishWord">
+        <el-input
+          v-model="queryParams.englishWord"
+          placeholder="英语单词"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="中文" prop="chineseWord">
+        <el-input
+          v-model="queryParams.chineseWord"
+          placeholder="请输入中文"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="创建时间">
+        <el-date-picker
+          v-model="daterangeCreateTime"
+          size="small"
+          style="width: 240px"
+          value-format="yyyy-MM-dd"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        ></el-date-picker>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['english:word:add']"
+        >新增
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['english:word:edit']"
+        >修改
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['english:word:remove']"
+        >删除
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['english:word:export']"
+        >导出
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <router-link :to="'/openapi/english/collect/'" class="link-type">
+          <el-button
+            type="warning"
+            plain
+            icon="el-icon-star-off"
+            size="mini"
+            @click="handleCollect"
+            v-hasPermi="['english:word:collect']"
+          >
+            收藏夹
+          </el-button>
+        </router-link>
+
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="wordList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center"/>
+      <el-table-column label="英语单词" align="center" prop="englishWord" :show-overflow-tooltip="true"/>
+      <el-table-column label="中文" align="center" prop="chineseWord" :show-overflow-tooltip="true"/>
+      <el-table-column label="排序" align="center" prop="sort" :show-overflow-tooltip="true"/>
+      <el-table-column label="收藏" align="center" prop="isCollect">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.english_collect" :value="scope.row.isCollect"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="置顶" align="center" prop="top">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.english_top" :value="scope.row.top"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="查看次数" align="center" prop="lookCount" :show-overflow-tooltip="true"/>
+      <el-table-column label="创建时间" align="center" prop="createTime" :show-overflow-tooltip="true"/>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-tooltip class="item" effect="dark" content="点击查看详情" placement="top-start">
+            <el-button circle
+                       type=""
+                       icon="el-icon-view"
+                       @click="handleView(scope.row,scope.index)"
+                       v-hasPermi="['openapi:word:query']"
+            ></el-button>
+          </el-tooltip>
+          <el-button circle
+                     type="primary"
+                     icon="el-icon-edit"
+                     @click="handleUpdate(scope.row)"
+                     v-hasPermi="['english:word:edit']"
+          ></el-button>
+          <el-button circle
+                     type="danger"
+                     icon="el-icon-delete"
+                     @click="handleDelete(scope.row)"
+                     v-hasPermi="['english:word:remove']"
+          ></el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 修改英语单词对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="formEdit" :model="form" :rules="rulesEdit" label-width="80px" v-loading="loadingEdit">
+        <el-form-item label="英语单词" prop="englishWord">
+          <el-input v-model="form.englishWord" placeholder="请输入英语单词"/>
+        </el-form-item>
+        <el-form-item label="中文" prop="chineseWord">
+          <el-input v-model="form.chineseWord" placeholder="请输入对应的中文"/>
+        </el-form-item>
+        <el-form-item label="排序" prop="sort">
+          <el-slider
+            v-model="form.sort"
+            show-input>
+          </el-slider>
+        </el-form-item>
+        <el-form-item label="收藏" prop="isCollect">
+          <el-select v-model="form.isCollect" placeholder="请选择是否收藏">
+            <el-option
+              v-for="dict in dict.type.english_collect"
+              :key="dict.value"
+              :label="dict.label"
+              :value="parseInt(dict.value)"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="置顶" prop="top">
+          <el-select v-model="form.top" placeholder="请选择置顶">
+            <el-option
+              v-for="dict in dict.type.english_top"
+              :key="dict.value"
+              :label="dict.label"
+              :value="parseInt(dict.value)"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitFormEdit">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+
+    <!--添加英语对话框-->
+    <el-dialog :title="title" :visible.sync="openAdd" width="500px" append-to-body>
+      <el-form ref="formAdd" :model="form" :rules="rulesAdd" label-width="80px" v-loading="loadingEdit">
+        <el-form-item label="中英文" prop="content">
+          <el-input v-model="form.content" placeholder="请输入中文或英文"/>
+        </el-form-item>
+        <el-form-item label="排序" prop="sort">
+          <el-slider
+            v-model="form.sort"
+            show-input>
+          </el-slider>
+        </el-form-item>
+        <el-form-item label="收藏" prop="isCollect">
+          <el-select v-model="form.isCollect" placeholder="请选择是否收藏">
+            <el-option
+              v-for="dict in dict.type.english_collect"
+              :key="dict.value"
+              :label="dict.label"
+              :value="parseInt(dict.value)"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="置顶" prop="top">
+          <el-select v-model="form.top" placeholder="请选择置顶">
+            <el-option
+              v-for="dict in dict.type.english_top"
+              :key="dict.value"
+              :label="dict.label"
+              :value="parseInt(dict.value)"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitFormAdd">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+
+
+    <!--    抽屉  查看详情-->
+    <el-drawer
+      title="单词内容"
+      :visible.sync="drawer"
+      direction="rtl"
+      :before-close="handleClose">
+
+
+      <div v-loading="loadingC">
+        <div class="div1">
+          {{ form.englishWord }}
+        </div>
+        <div class="div2">
+          {{ form.content }}
+        </div>
+        <div class="div2" style="height:320px ">
+          {{ oneEnglishData.en }}
+          <el-divider><i class="el-icon-mobile-phone"></i></el-divider>
+          {{ oneEnglishData.zh }}
+        </div>
+      </div>
+
+
+    </el-drawer>
+  </div>
+</template>
+
+<script>
+import {listWord, getWord, delWord, addWord, updateWord, getWordRPC} from "@/api/business/english/word";
+import {getOneEnglishApi} from "@/api/business/openapi/oneenglish";
+
+export default {
+  name: "Word",
+  dicts: ['english_collect', 'english_top'],
+  data() {
+    return {
+      // 抽屉遮罩层
+      loadingC: true,
+      //抽屉开关
+      drawer: false,
+      // 遮罩层
+      loading: true,
+      loadingEdit: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 英语单词表格数据
+      wordList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      openAdd: false,
+      // 查看次数时间范围
+      daterangeCreateTime: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        englishWord: null,
+        chineseWord: null,
+        createTime: null
+      },
+      // 表单参数
+      form: {
+        sort: 0
+      },
+      //英语一言数据
+      oneEnglishData: {},
+      // 表单校验
+      rulesEdit: {
+        englishWord: [
+          {required: true, message: "英语单词不能为空", trigger: "blur"}
+        ],
+        chineseWord: [
+          {required: true, message: "中文不能为空", trigger: "blur"}
+        ],
+        isCollect: [
+          {required: true, message: "是否收藏 1收藏 2不收藏不能为空", trigger: "blur"}
+        ],
+        top: [
+          {required: true, message: "置顶 1置顶 2不置顶不能为空", trigger: "blur"}
+        ],
+        createTime: [
+          {required: true, message: "创建时间不能为空", trigger: "blur"}
+        ]
+      },
+      rulesAdd: {
+        content: [
+          {required: true, message: "中英文不能为空", trigger: "blur"}
+        ],
+        isCollect: [
+          {required: true, message: "是否收藏 1收藏 2不收藏不能为空", trigger: "blur"}
+        ],
+        top: [
+          {required: true, message: "置顶 1置顶 2不置顶不能为空", trigger: "blur"}
+        ],
+        createTime: [
+          {required: true, message: "创建时间不能为空", trigger: "blur"}
+        ]
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    //获取英语一言api数据
+    getOneEnglishApi() {
+      getOneEnglishApi().then(res => {
+        this.oneEnglishData = res.data
+      })
+    },
+
+    //根据id查询放入抽屉
+    findById(id) {
+      this.loadingC = true;
+      getWordRPC(id).then(res => {
+        this.form = res.data
+        this.loadingC = false
+      })
+    },
+
+
+    //关闭抽屉
+    handleClose(done) {
+      done();
+      this.getList();
+    },
+
+    /** 详细按钮操作 */
+    handleView(row) {
+      this.drawer = true
+      this.form = row;
+      this.findById(row.id)
+      this.getOneEnglishApi()
+    },
+
+    /** 查询英语单词列表 */
+    getList() {
+      this.loading = true;
+      this.queryParams.params = {};
+      if (null != this.daterangeCreateTime && '' != this.daterangeCreateTime) {
+        this.queryParams.createTime = this.daterangeCreateTime[0];
+        this.queryParams.endCreateTime = this.daterangeCreateTime[1];
+      }
+      listWord(this.queryParams).then(response => {
+        this.wordList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.openAdd = false
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        englishWord: null,
+        chineseWord: null,
+        sort: null,
+        isCollect: null,
+        top: null,
+        lookCount: null,
+        createTime: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.daterangeCreateTime = [];
+      this.queryParams.createTime=null
+      this.queryParams.endCreateTime=null
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length !== 1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.openAdd = true;
+      this.title = "添加英语单词";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getWord(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改英语单词";
+      });
+    },
+    /** 提交按钮 */
+    submitFormEdit() {
+      this.$refs["formEdit"].validate(valid => {
+          if (valid) {
+            if (this.form.id != null) {
+              this.loadingEdit = true
+              updateWord(this.form).then(response => {
+                this.$modal.msgSuccess("修改成功");
+                this.loadingEdit = false
+                this.open = false;
+                this.getList();
+              }).catch(err => {
+                this.loadingEdit = false
+              });
+
+            }
+          }
+        }
+      );
+    },
+
+    submitFormAdd() {
+      this.$refs["formAdd"].validate(valid => {
+          if (valid) {
+            if (this.form.id == null) {
+              this.loadingEdit = true
+              addWord(this.form).then(response => {
+                this.$modal.msgSuccess("新增成功");
+                this.openAdd = false;
+                this.loadingEdit = false
+                this.getList();
+              }).catch(err => {
+                this.loadingEdit = false
+              });
+
+            }
+          }
+        }
+      );
+    },
+
+
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除英语单词编号为"' + ids + '"的数据项？').then(function () {
+        return delWord(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {
+      });
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('english/word/export', {
+        ...this.queryParams
+      }, `word_${new Date().getTime()}.xlsx`)
+    },
+
+    //收藏夹操作
+    handleCollect() {
+
+    }
+  }
+};
+</script>
+<style scoped>
+.div1 {
+  box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+  height: 180px;
+  margin: 10px;
+  padding: 30px;
+  padding-top: 60px;
+  text-align: center;
+  text-shadow: 2px 2px 2px grey;
+  font-size: 30px;
+}
+
+.div2 {
+  box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+  margin: 10px;
+  padding: 30px;
+  height: 280px;
+  padding-top: 100px;
+  text-align: center;
+  text-shadow: 2px 2px 2px grey;
+  font-size: 20px;
+}
+</style>

ruoyi-ui/src/views/business/monitor/service/index.vue

@@ -0,0 +1,126 @@
+<template>
+  <div>
+    <el-row :gutter="20">
+      <el-col :span="12">
+        <div class="grid-content bg-purple">
+          <el-tag type="info">jvm版本</el-tag>
+          {{serviceMonitorInfo.jvmVersion}}
+          <br>
+          <el-tag type="info">jre安装路径</el-tag>
+          {{serviceMonitorInfo.jreHoneDir}}
+          <br>
+          <el-tag type="info">jre版本</el-tag>
+          {{serviceMonitorInfo.jreVersion}}
+          <br>
+          <el-tag type="info">jre名称</el-tag>
+          {{serviceMonitorInfo.jreName}}
+          <br>
+        </div>
+      </el-col>
+      <el-col :span="12">
+        <div class="grid-content bg-purple">
+          <el-tag type="info">系统名称</el-tag>
+          {{serviceMonitorInfo.osName}}
+          <br>
+          <el-tag type="info">系统版本</el-tag>
+          {{serviceMonitorInfo.osVersion}}
+          <br>
+          <el-tag type="info">系统架构</el-tag>
+          {{serviceMonitorInfo.osArch}}
+          <br>
+        </div>
+      </el-col>
+    </el-row>
+    <el-row :gutter="20">
+      <el-col :span="12">
+        <div class="grid-content bg-purple">
+          <el-tag type="info">主机名</el-tag>
+          {{serviceMonitorInfo.hostName}}
+          <br>
+          <el-tag type="info">主机地址</el-tag>
+          {{serviceMonitorInfo.hostAddress}}
+          <br>
+          <el-tag type="info">登录名</el-tag>
+          {{serviceMonitorInfo.userName}}
+          <br>
+          <el-tag type="info">用户路径</el-tag>
+          {{serviceMonitorInfo.homeDir}}
+          <br>
+          <el-tag type="info">当前目录</el-tag>
+          {{serviceMonitorInfo.currentDir}}
+          <br>
+          <el-tag type="info">登录语言</el-tag>
+          {{serviceMonitorInfo.userLanguage}}
+          <br>
+          <el-tag type="info">登录区域</el-tag>
+          {{serviceMonitorInfo.userCountry}}
+          <br>
+        </div>
+      </el-col>
+      <el-col :span="12">
+        <div class="grid-content bg-purple">
+          <el-tag type="info">最大jvm内存</el-tag>
+          {{serviceMonitorInfo.maxMemory/1024/1024+"M"}}
+          <br>
+          <el-tag type="info">已分配内存</el-tag>
+          {{serviceMonitorInfo.totalMemory/1024/1024+"M"}}
+          <br>
+          <el-tag type="info">剩余内存</el-tag>
+          {{parseFloat(Number(serviceMonitorInfo.freeMemory/1024/1024).toFixed(0))+"M"}}
+          <br>
+          <el-tag type="info">最大可用内存</el-tag>
+          {{parseFloat(Number(serviceMonitorInfo.usableMemory/1024/1024).toFixed(0))+"M"}}
+          <br>
+
+        </div>
+      </el-col>
+    </el-row>
+  </div>
+
+</template>
+
+<script>
+import {getServiceMonitor} from "@/api/business/monitor/service/monitorservice";
+
+export default {
+  name: "Online",
+  data() {
+    return {
+      serviceMonitorInfo:{
+
+      }
+    }
+
+  },
+  created() {
+    this.getServiceMonitor()
+  },
+  methods: {
+    getServiceMonitor() {
+      getServiceMonitor().then(res =>{
+        this.serviceMonitorInfo=res.data
+      })
+    },
+  },
+};
+</script>
+
+<style scoped>
+.el-row {
+  margin: 100px;
+  padding: 0 20px;
+}
+.el-col {
+  border-radius: 4px;
+}
+.grid-content {
+  border-radius: 4px;
+  min-height: 36px;
+  padding: 0 180px;
+}
+.row-bg {
+  padding: 10px 0;
+  background-color: #f9fafc;
+}
+</style>
+

ruoyi-ui/src/views/business/openapi/copywriting/index.vue

@@ -0,0 +1,298 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="文案内容" prop="content">
+        <el-input
+          v-model="queryParams.content"
+          placeholder="请输入文案内容"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="文案来源" prop="source">
+        <el-input
+          v-model="queryParams.source"
+          placeholder="请输入文案来源"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="文案类型" prop="type">
+        <el-select v-model="queryParams.type" placeholder="请选择文案类型" clearable size="small">
+          <el-option
+            v-for="dict in dict.type.copywriting_type"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="创建时间">
+        <el-date-picker
+          v-model="daterangeCreateTime"
+          size="small"
+          style="width: 240px"
+          value-format="yyyy-MM-dd"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        ></el-date-picker>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['openapi:copywriting:delete']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['openapi:copywriting:export']"
+        >导出</el-button>
+      </el-col>
+
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          @click="delRepeatCopyWriting"
+          v-hasPermi="['openapi:copywriting:delete']"
+        >删除重复文案</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="copyWritingList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="文案内容" align="center" prop="content" :show-overflow-tooltip="true" width="700px"/>
+      <el-table-column label="文案来源" align="center" prop="source" :show-overflow-tooltip="true" />
+      <el-table-column label="创建时间" align="center" prop="createTime" width="180" :show-overflow-tooltip="true">
+      </el-table-column>
+      <el-table-column label="文案类型" align="center" prop="type" :show-overflow-tooltip="true">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.copywriting_type" :value="scope.row.type"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="120px">
+        <template slot-scope="scope">
+          <el-tooltip class="item" effect="dark" content="点击查看详情" placement="top-start">
+          <el-button circle
+            type=""
+            icon="el-icon-view"
+            @click="handleView(scope.row,scope.index)"
+            v-hasPermi="['openapi:copywriting:query']"
+          ></el-button>
+          </el-tooltip>
+          <el-tooltip class="item" effect="dark" content="点击删除" placement="top-start">
+          <el-button circle
+            type="danger"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['openapi:copywriting:delete']"
+          ></el-button>
+          </el-tooltip>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 操作日志详细 -->
+    <el-dialog title="内容详细" :visible.sync="open" width="700px" append-to-body>
+      <el-form ref="form" :model="form" label-width="100px" size="mini">
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="文案内容：">{{ form.content }}</el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="open = false">关 闭</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listCopyWriting, getCopyWriting,delRepeatCopyWriting, delCopyWriting } from "@/api/business/openapi/copywriting";
+
+export default {
+  name: "CopyWriting",
+  dicts: ['copywriting_type'],
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 文案api，通过api获取文案信息表格数据
+      copyWritingList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 文案类型时间范围
+      daterangeCreateTime: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        content: null,
+        source: null,
+        createTime: null,
+        type: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        content: [
+          { required: true, message: "文案内容不能为空", trigger: "blur" }
+        ],
+        source: [
+          { required: true, message: "文案来源不能为空", trigger: "blur" }
+        ]
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    //删除重复文案
+    delRepeatCopyWriting() {
+      delRepeatCopyWriting().then(res =>{
+        this.$modal.msgSuccess("删除"+res.data+"条");
+        this.getList();
+      })
+    },
+
+    /** 详细按钮操作 */
+    handleView(row) {
+      this.open = true;
+      this.form = row;
+    },
+
+    /** 查询文案api，通过api获取文案信息列表 */
+    getList() {
+      this.loading = true;
+      this.queryParams.params = {};
+      if (null != this.daterangeCreateTime && '' != this.daterangeCreateTime) {
+        this.queryParams.createTime = this.daterangeCreateTime[0];
+        this.queryParams.endCreateTime = this.daterangeCreateTime[1];
+      }
+      listCopyWriting(this.queryParams).then(response => {
+        this.copyWritingList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        content: null,
+        source: null,
+        createTime: null,
+        type: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.daterangeCreateTime = [];
+      this.queryParams.createTime=null
+      this.queryParams.endCreateTime=null
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateCopyWriting(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addCopyWriting(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除文案api，通过api获取文案信息编号为"' + ids + '"的数据项？').then(function() {
+        return delCopyWriting(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('openapi/copyWriting/export', {
+        ...this.queryParams
+      }, `copyWriting_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

ruoyi-ui/src/views/business/openapi/log/index.vue

@@ -0,0 +1,204 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="接口名称" prop="apiName">
+        <el-input
+          v-model="queryParams.apiName"
+          placeholder="请输入接口名称"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['openapi:log:remove']"
+        >删除
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['openapi:log:export']"
+        >导出
+        </el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="logList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center"/>
+      <el-table-column label="接口名称" align="center" prop="apiName" :show-overflow-tooltip="true"/>
+      <el-table-column label="请求URL" align="center" prop="url" :show-overflow-tooltip="true"/>
+      <el-table-column label="请求方法" align="center" prop="method" :show-overflow-tooltip="true"/>
+      <el-table-column label="请求参数" align="center" prop="request" :show-overflow-tooltip="true"/>
+      <el-table-column label="响应参数" align="center" prop="response" :show-overflow-tooltip="true"/>
+      <el-table-column label="创建时间" align="center" prop="createTime" :show-overflow-tooltip="true"/>
+        <el-table-column label="是否请求成功" align="center" prop="isSuccess" :show-overflow-tooltip="true">
+          <template slot-scope="scope">
+            <el-tag :type="scope.row.isSuccess==='成功'?'success':'danger'" size="small">{{ scope.row.isSuccess }}</el-tag>
+          </template>
+        </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            circle
+            type="danger"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['openapi:log:remove']"
+          >
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+  </div>
+</template>
+
+<script>
+import {listLog, getLog, delLog} from "@/api/business/openapi/log";
+
+export default {
+  name: "Log",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 日志表格数据
+      logList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        apiName: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {}
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询日志列表 */
+    getList() {
+      this.loading = true;
+      listLog(this.queryParams).then(response => {
+        this.logList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        apiName: null,
+        url: null,
+        method: null,
+        request: null,
+        response: null,
+        isSuccess: null,
+        createTime:null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length !== 1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加日志";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getLog(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改日志";
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除日志编号为"' + ids + '"的数据项？').then(function () {
+        return delLog(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {
+      });
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('openapi/log/export', {
+        ...this.queryParams
+      }, `log_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

ruoyi-ui/src/views/business/openapi/oneenglish/index.vue

@@ -0,0 +1,186 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="英文" prop="en">
+        <el-input
+          v-model="queryParams.en"
+          placeholder="请输入英文"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="中文" prop="zh">
+        <el-input
+          v-model="queryParams.zh"
+          placeholder="请输入中文"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['openapi:oneenglish:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['openapi:oneenglish:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="oneenglishList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="英文" align="center" prop="en" />
+      <el-table-column label="中文" align="center" prop="zh" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="120px">
+        <template slot-scope="scope">
+          <el-button
+            circle
+            type="danger"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['openapi:oneenglish:remove']"
+          ></el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+
+  </div>
+</template>
+
+<script>
+import { listOneenglish, getOneenglish, delOneenglish } from "@/api/business/openapi/oneenglish";
+
+export default {
+  name: "Oneenglish",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 英语一言表格数据
+      oneenglishList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        en: null,
+        zh: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询英语一言列表 */
+    getList() {
+      this.loading = true;
+      listOneenglish(this.queryParams).then(response => {
+        this.oneenglishList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        en: null,
+        zh: null,
+        createTime: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length !== 1
+      this.multiple = !selection.length
+    },
+
+
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除英语一言编号为"' + ids + '"的数据项？').then(function () {
+        return delOneenglish(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {
+      });
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('openapi/oneenglish/export', {
+        ...this.queryParams
+      }, `oneenglish_${new Date().getTime()}.xlsx`)
+    }
+  }
+}
+</script>

ruoyi-ui/src/views/business/openapi/translation/index.vue

@@ -0,0 +1,194 @@
+<template>
+  <div class="app-container">
+    <el-row>
+      <el-col :span="24" v-loading="loading1">
+          <div class="grid-content bg-purple" style="height: 180px">
+              <!--          文案内容区域-->
+              <!--          内容-->
+              <div class="content_div">
+                {{responseCopyWriting.content}}
+              </div>
+              <!--          来源-->
+              <div class="source_div">
+                {{responseCopyWriting.source}}
+              </div>
+          </div>
+      </el-col>
+    </el-row>
+    <el-row :gutter="20">
+      <el-col :span="12">
+        <!--        翻译区域-->
+        <div class="grid-content bg-purple">
+          <el-row :gutter="15">
+            <el-form ref="translation" :model="translationData" :rules="translationRules" size="medium"
+                     label-width="100px" label-position="top">
+              <el-col :span="12">
+                <el-form-item label="翻译平台" prop="translationType">
+                  <el-select
+                    v-model="translationData.translationType"
+                    placeholder="翻译平台"
+                    clearable
+                    size="small"
+                    style="width: 150px">
+                    <el-option
+                      v-for="dict in dict.type.translation_type"
+                      :key="dict.value"
+                      :label="dict.label"
+                      :value="dict.value"/>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="20" >
+                <el-form-item label="翻译区域" prop="q">
+                  <el-input v-model="translationData.q" type="textarea" placeholder="请输入翻译内容" show-word-limit
+                            :autosize="{minRows: 4, maxRows: 4}" :style="{width: '100%'}"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="24">
+                <el-form-item size="large">
+                  <el-button type="primary" @click="submitForm">提交</el-button>
+                  <el-button @click="resetForm">重置</el-button>
+                  <el-button type="info" icon="el-icon-check" @click="getCopyWriting" circle></el-button>
+                </el-form-item>
+              </el-col>
+            </el-form>
+          </el-row>
+        </div>
+      </el-col>
+      <el-col :span="12">
+        <!--        翻译结果显示区域-->
+        <div class="grid-content bg-purple ">
+          <div class="spans" v-loading="loading2">
+            {{ responseTranslation }}
+          </div>
+        </div>
+      </el-col>
+    </el-row>
+
+
+  </div>
+</template>
+
+<script>
+import {translation,getCopyWriting} from "@/api/business/openapi/translation";
+
+export default {
+  dicts: ['translation_type'],
+  name: "Log",
+  data() {
+    return {
+      // 遮罩层
+      loading1: true,
+      loading2: false,
+
+      //翻译响应数据
+      responseTranslation: '',
+
+      translationData: {
+        translationType: '',
+        q: '',
+      },
+
+      //文案参数
+      copyWriting:[],
+
+      //文案响应数据
+      responseCopyWriting:{},
+
+      translationRules: {
+        translationType: [{
+          required: true,
+          message: '翻译平台不能为空',
+          trigger: 'change'
+        }],
+        q: [
+          {
+          required: true,
+          message: '请输入翻译内容',
+          trigger: 'blur'
+        },
+          {
+            min: 1,
+            max: 120,
+            message: '长度在 1 到 120 个字符',
+            trigger: 'blur'
+          }
+        ],
+      },
+    }
+  },
+  created() {
+    this.getCopyWriting()
+  },
+  methods: {
+    //获取文案
+    getCopyWriting() {
+      this.loading1 = true;
+      getCopyWriting(this.copyWriting).then(res =>{
+        this.responseCopyWriting=res.data
+        this.loading1 = false;
+      })
+    },
+
+    submitForm() {
+      this.$refs['translation'].validate(valid => {
+        if (valid) {
+          this.loading2 = true;
+          translation(this.translationData).then(res => {
+            let result = res.data.transResult
+            let results = ''
+            result.forEach(r => {
+              results = results + '  ' + r.dst;
+            })
+            this.responseTranslation = results
+            this.loading2 = false;
+          })
+        }
+
+      })
+    },
+    resetForm() {
+      this.$refs['translation'].resetFields()
+    },
+  },
+};
+</script>
+
+<style scoped>
+.bg-purple {
+  box-shadow: 0 0 9px 3px #999;
+}
+
+.grid-content {
+  border-radius: 4px;
+  min-height: 36px;
+  height: 500px;
+  margin-top: 20px;
+  padding: 50px;
+}
+
+.spans {
+  margin: 50px;
+  margin-top: 40px;
+  padding: 50px;
+  font-family: Georgia;
+  font-size: 20px;
+  height: 300px;
+  box-shadow: 0 0 9px 3px #999;
+  font-style: italic;
+}
+
+.content_div{
+  float: left;
+  width: 75%;
+  text-shadow: 2px 2px 2px grey;
+}
+.source_div{
+  float: left;
+  padding-top: 70px;
+  width: 25%;
+  text-shadow: 2px 2px 2px grey;
+  text-align :right
+}
+
+</style>

ruoyi-ui/src/views/business/warning/apiwarning/index.vue

@@ -0,0 +1,219 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="api名称" prop="apiName">
+        <el-input
+          v-model="queryParams.apiName"
+          placeholder="请输入api名称"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['warning:apiwarning:edit']"
+        >修改
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['warning:apiwarning:export']"
+        >导出
+        </el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="apiwarningList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center"/>
+      <el-table-column label="API名称" align="center" prop="apiName" :show-overflow-tooltip="true"/>
+      <el-table-column label="API地址" align="center" prop="apiUrl" :show-overflow-tooltip="true"/>
+      <el-table-column label="API总请求次数" align="center" prop="totalCount" :show-overflow-tooltip="true"/>
+      <el-table-column label="请求耗费时间" align="center" prop="requestTime" :show-overflow-tooltip="true">
+        <template slot-scope="scope">
+          <span>{{scope.row.requestTime+"ms"}}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="API每天限制请求次数" align="center" prop="limitCount" :show-overflow-tooltip="true"/>
+
+      <el-table-column label="API每天请求次数" align="center" prop="dayCount"/>
+      <el-table-column label="调用时间" align="center" prop="updateTime" width="180"/>
+      <el-table-column label="创建时间" align="center" prop="createTime" width="180" :show-overflow-tooltip="true">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button circle
+                     type="primary"
+                     icon="el-icon-edit"
+                     @click="handleUpdate(scope.row)"
+                     v-hasPermi="['warning:apiwarning:edit']"
+          ></el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改API预警对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="请求次数" prop="limitCount">
+          <el-input v-model="form.limitCount" placeholder="请输入api限制请求次数每天"/>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {listApiwarning, getApiwarning, updateApiwarning} from "@/api/business/warning/apiwarning";
+
+export default {
+  name: "Apiwarning",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // API预警表格数据
+      apiwarningList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        apiName: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {}
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询API预警列表 */
+    getList() {
+      this.loading = true;
+      listApiwarning(this.queryParams).then(response => {
+        this.apiwarningList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        apiName: null,
+        apiUrl: null,
+        totalCount: null,
+        requestTime: null,
+        limitCount: null,
+        createTime: null,
+        dayCount: null,
+        updateTime: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length !== 1
+      this.multiple = !selection.length
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getApiwarning(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改API预警";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateApiwarning(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('warning/apiwarning/export', {
+        ...this.queryParams
+      }, `apiwarning_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

ruoyi-ui/vue.config.js

@@ -7,9 +7,9 @@ function resolve(dir) {
 
 const CompressionPlugin = require('compression-webpack-plugin')
 
-const name = process.env.VUE_APP_TITLE || '若依管理系统' // 网页标题
+const name = process.env.VUE_APP_TITLE || '管理平台' // 网页标题
 
-const port = process.env.port || process.env.npm_config_port || 80 // 端口
+const port = process.env.port || process.env.npm_config_port || 88 // 端口
 
 // vue.config.js 配置说明
 //官方vue.config.js 参考文档 https://cli.vuejs.org/zh/config/#css-loaderoptions
@@ -69,8 +69,8 @@ module.exports = {
     ],
   },
   chainWebpack(config) {
-    config.plugins.delete('preload') // TODO: need test
+    config.plugins.delete('preload')
-    config.plugins.delete('prefetch') // TODO: need test
+    config.plugins.delete('prefetch')
 
     // set svg-sprite-loader
     config.module

ruoyi-visual/ruoyi-monitor/src/main/java/com/ruoyi/modules/monitor/RuoYiMonitorApplication.java

@@ -1,8 +1,8 @@
 package com.ruoyi.modules.monitor;
 
+import de.codecentric.boot.admin.server.config.EnableAdminServer;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import de.codecentric.boot.admin.server.config.EnableAdminServer;
 
 /**
  * 监控中心

ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap.yml

@@ -23,3 +23,5 @@ spring:
         # 共享配置
         shared-configs:
           - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+        #命名空间
+        namespace: xjs-666

ruoyi-visual/ruoyi-monitor/src/main/resources/rebel.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  This is the JRebel configuration file. It maps the running application to your IDE workspace, enabling JRebel reloading for this project.
+  Refer to https://manuals.jrebel.com/jrebel/standalone/config.html for more information.
+-->
+<application generated-by="intellij" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.zeroturnaround.com" xsi:schemaLocation="http://www.zeroturnaround.com http://update.zeroturnaround.com/jrebel/rebel-2_3.xsd">
+
+	<id>ruoyi-visual-monitor</id>
+
+	<classpath>
+		<dir name="D:/Dev/IdeaPerject/GitHub/RuoYi-Cloud/ruoyi-visual/ruoyi-monitor/target/classes">
+		</dir>
+	</classpath>
+
+</application>

xjs-business/pom.xml

@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>ruoyi</artifactId>
+        <groupId>com.ruoyi</groupId>
+        <version>3.3.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>com.xjs</groupId>
+    <artifactId>xjs-business</artifactId>
+    <packaging>pom</packaging>
+    <description>业务模块</description>
+    <name>业务模块</name>
+    <modules>
+        <module>xjs-business-openapi</module>
+        <module>xjs-business-english</module>
+        <module>xjs-business-common</module>
+        <module>xjs-business-warning</module>
+        <module>xjs-business-monitor</module>
+    </modules>
+
+    <properties>
+
+    </properties>
+
+    <dependencies>
+        <!-- SpringCloud Alibaba Nacos -->
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
+        </dependency>
+
+        <!-- SpringCloud Alibaba Nacos Config -->
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
+        </dependency>
+
+        <!-- SpringCloud Alibaba Sentinel -->
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
+        </dependency>
+
+        <!-- SpringBoot Actuator -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
+        </dependency>
+
+        <!-- Swagger UI -->
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger-ui</artifactId>
+            <version>${swagger.fox.version}</version>
+        </dependency>
+
+        <!-- Mysql Connector -->
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+        </dependency>
+
+        <!-- RuoYi Common DataSource -->
+        <dependency>
+            <groupId>com.ruoyi</groupId>
+            <artifactId>ruoyi-common-datasource</artifactId>
+        </dependency>
+
+        <!-- RuoYi Common DataScope -->
+        <dependency>
+            <groupId>com.ruoyi</groupId>
+            <artifactId>ruoyi-common-datascope</artifactId>
+        </dependency>
+
+        <!-- RuoYi Common Log -->
+        <dependency>
+            <groupId>com.ruoyi</groupId>
+            <artifactId>ruoyi-common-log</artifactId>
+        </dependency>
+
+        <!-- RuoYi Common Swagger -->
+        <dependency>
+            <groupId>com.ruoyi</groupId>
+            <artifactId>ruoyi-common-swagger</artifactId>
+        </dependency>
+
+        <!--/////////////////////本模块专属依赖/////////////////////////-->
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-boot-starter</artifactId>
+            <version>${mybatisplus.version}</version>
+        </dependency>
+
+        <!--lombok-->
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+        </dependency>
+
+        <!--测试-->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+        </dependency>
+
+        <!--工具类-->
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-all</artifactId>
+            <version>${hutool.version}</version>
+        </dependency>
+
+        <!--热部署、有毒，一加上redis就出问题 -->
+        <!--<dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-devtools</artifactId>
+        </dependency>-->
+
+
+    </dependencies>
+
+</project>

xjs-business/xjs-business-common/pom.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>xjs-business</artifactId>
+        <groupId>com.xjs</groupId>
+        <version>3.3.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <name>业务模块-通用工具</name>
+
+    <artifactId>xjs-business-common</artifactId>
+
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+    </properties>
+
+</project>

xjs-business/xjs-business-common/src/main/java/com/xjs/config/BaiduProperties.java

@@ -0,0 +1,28 @@
+package com.xjs.config;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author xiejs
+ * @desc
+ * @create 2021-12-25
+ */
+@Data
+@ConfigurationProperties(prefix = "baidu.open")
+@Component
+public class BaiduProperties {
+
+    /**
+     * APP ID
+     */
+    private String appId;
+
+    /**
+     * 密钥
+     */
+    private String key;
+
+
+}

xjs-business/xjs-business-common/src/main/java/com/xjs/config/FeignConfig.java

@@ -0,0 +1,22 @@
+package com.xjs.config;
+
+import feign.Logger;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * @author xiejs
+ * @desc
+ * @create 2021-12-25
+ */
+@Configuration
+public class FeignConfig{
+    /**
+     * 配置日志输出
+     * @return
+     */
+    @Bean
+    Logger.Level feignLoggerLevel() {
+        return Logger.Level.FULL;
+    }
+}

xjs-business/xjs-business-common/src/main/java/com/xjs/config/JsonConfig.java

@@ -0,0 +1,76 @@
+package com.xjs.config;
+
+import com.alibaba.fastjson.serializer.SerializerFeature;
+import com.alibaba.fastjson.serializer.ValueFilter;
+import com.alibaba.fastjson.support.config.FastJsonConfig;
+import com.alibaba.fastjson.support.spring.FastJsonHttpMessageConverter;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+import com.fasterxml.jackson.databind.module.SimpleModule;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.autoconfigure.http.HttpMessageConverters;
+import org.springframework.boot.autoconfigure.jackson.Jackson2ObjectMapperBuilderCustomizer;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Primary;
+import org.springframework.http.MediaType;
+import org.springframework.http.converter.HttpMessageConverter;
+import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * @author xiejs
+ * @desc 全局序列化处理配置
+ * @create 2021-12-26
+ */
+@Configuration
+public class JsonConfig {
+    @Bean
+    public HttpMessageConverters fastJsonHttpMessageConverters() {
+        FastJsonHttpMessageConverter fastConverter = new FastJsonHttpMessageConverter();
+        FastJsonConfig fastJsonConfig = new FastJsonConfig();
+        List<SerializerFeature> list = new ArrayList<>();
+        list.add(SerializerFeature.PrettyFormat);
+        list.add(SerializerFeature.WriteMapNullValue);
+        list.add(SerializerFeature.WriteNullStringAsEmpty);
+        list.add(SerializerFeature.WriteNullListAsEmpty);
+        list.add(SerializerFeature.QuoteFieldNames);
+        list.add(SerializerFeature.WriteDateUseDateFormat);
+        list.add(SerializerFeature.DisableCircularReferenceDetect);
+        list.add(SerializerFeature.WriteBigDecimalAsPlain);
+
+        //返回枚举类型为枚举toString  mp通用枚举用到
+        list.add(SerializerFeature.WriteEnumUsingToString);
+
+        fastJsonConfig.setSerializerFeatures(list.toArray(new SerializerFeature[list.size()]));
+        fastConverter.setFastJsonConfig(fastJsonConfig);
+        HttpMessageConverter<?> converter = fastConverter;
+
+        //解决远程调用  ---（Content-Type cannot contain wildcard type '*'）报错
+        fastConverter.setSupportedMediaTypes(Arrays.asList(MediaType.APPLICATION_JSON, MediaType.APPLICATION_JSON_UTF8));
+
+        //解决mp雪花算法前端精度丢失
+        fastJsonConfig.setSerializeFilters(new ValueFilter() {
+            @Override
+            public Object process(Object object, String name, Object value) {
+                if ((StringUtils.endsWith(name, "Id") || StringUtils.equals(name,"id")) && value != null
+                        && value.getClass() == Long.class) {
+                    return String.valueOf(value);
+                }
+                return value;
+            }
+        });
+        return new HttpMessageConverters(converter);
+    }
+
+    @Bean
+    public Jackson2ObjectMapperBuilderCustomizer customizer(){
+        return builder -> builder.featuresToEnable(SerializationFeature.WRITE_ENUMS_USING_TO_STRING);
+    }
+
+}

xjs-business/xjs-business-common/src/main/java/com/xjs/config/MybatisPlusConfig.java

@@ -0,0 +1,27 @@
+package com.xjs.config;
+
+import com.baomidou.mybatisplus.annotation.DbType;
+import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * @author xiejs
+ * @desc
+ * @create 2021-12-31
+ */
+@Configuration
+public class MybatisPlusConfig {
+
+    /**
+     *  mysql分页插件
+     * @return MybatisPlusInterceptor
+     */
+    @Bean
+    public MybatisPlusInterceptor mybatisPlusInterceptor() {
+        MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
+        interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL));
+        return interceptor;
+    }
+}

xjs-business/xjs-business-common/src/main/java/com/xjs/config/TianXingProperties.java

@@ -0,0 +1,21 @@
+package com.xjs.config;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author xiejs
+ * @desc  天行数据配置
+ * @create 2021-12-27
+ */
+@Component
+@ConfigurationProperties(prefix = "tianxing.open")
+@Data
+public class TianXingProperties {
+
+    /**
+     * key密钥
+     */
+    private String key;
+}

xjs-business/xjs-business-common/src/main/java/com/xjs/consts/ApiConst.java

@@ -0,0 +1,55 @@
+package com.xjs.consts;
+
+/**
+ * @author xiejs
+ * @desc api名称常量类
+ * @create 2021-12-28
+ */
+public class ApiConst {
+
+    //--------------------name------------------------------
+
+    public static final String YOUDAO_FY= "有道翻译";
+
+    public static final String BAIDU_FY= "百度翻译";
+
+    public static final String TIANXING_PYQ= "天行-朋友圈";
+
+    public static final String TIANXING_WYY= "天行-网易云";
+
+    public static final String TIANXING_JDTC= "天行-经典台词";
+
+    public static final String TIANXING_MMMY= "天行-名人名言";
+
+    public static final String TIANXING_TRAN_DICT= "天行-翻译字典";
+
+    public static final String TIANXING_ONE_ENGLISH= "天行-英语一言";
+
+
+
+    public static final String TEN_YY= "Ten-一言";
+
+
+    //-------------------url------------------------------
+
+    public static final String BAIDU_FY_URL= "http://api.fanyi.baidu.com/api/trans/vip/translate";
+
+    public static final String YOUDAO_FY_URL= "http://fanyi.youdao.com/translate";
+
+    public static final String TIANXING_PYQ_URL= "http://api.tianapi.com/pyqwenan/index";
+
+    public static final String TIANXING_WYY_URL= "http://api.tianapi.com/hotreview/index";
+
+    public static final String TIANXING_JDTC_URL= "http://api.tianapi.com/dialogue/index";
+
+    public static final String TIANXING_MMMY_URL= "http://api.tianapi.com/mingyan/index";
+
+    public static final String TIANXING_TRAN_DICT_URL= "http://api.tianapi.com/enwords/index";
+
+    public static final String TIANXING_ONE_ENGLISH_URL= "http://api.tianapi.com/ensentence/index";
+
+
+
+    public static final String TEN_YY_URL= "https://tenapi.cn/yiyan/";
+
+}

xjs-business/xjs-business-common/src/main/java/com/xjs/consts/EnglishWordConst.java

@@ -0,0 +1,23 @@
+package com.xjs.consts;
+
+/**
+ * @author xiejs
+ * @desc 英语单词常量类
+ * @create 2021-12-31
+ */
+public class EnglishWordConst {
+
+    //置顶
+    public static final Integer TOP = 1;
+
+    //不置顶
+    public static final Integer NO_TOP = 2;
+
+    //收藏
+    public static final Integer COLLECT = 1;
+
+    //不收藏
+    public static final Integer NO_COLLECT = 2;
+
+
+}

xjs-business/xjs-business-common/src/main/java/com/xjs/consts/RedisConst.java

@@ -0,0 +1,28 @@
+package com.xjs.consts;
+
+/**
+ * @author xiejs
+ * @desc  redis key常量
+ * @create 2021-12-30
+ */
+public class RedisConst {
+
+    //----------------------key------------------------
+
+    /**
+     * 翻译字典常量key
+     */
+    public static final String TRAN_DICT= "tranDict";
+
+    /**
+     * 英语一言常量key
+     */
+    public static final String ONE_ENGLISH= "oneEnglish";
+
+
+    //-------------------有效时间-----------------------
+    public static final Integer TRAN_DICT_EXPIRE = 7;   //天
+
+    public static final Integer ONE_ENGLISH_EXPIRE = 3;   //分钟
+
+}

xjs-business/xjs-business-common/src/main/java/com/xjs/consts/ReqConst.java

@@ -0,0 +1,11 @@
+package com.xjs.consts;
+
+/**
+ * @author xiejs
+ * @desc  请求是否成功常量
+ * @create 2021-12-26
+ */
+public class ReqConst {
+    public static final Integer SUCCESS = 1;
+    public static final Integer ERROR = 2;
+}

xjs-business/xjs-business-common/src/main/java/com/xjs/consts/TianXingConst.java

@@ -0,0 +1,20 @@
+package com.xjs.consts;
+
+/**
+ * @author xiejs
+ * @desc  各个数据平台常量类
+ * @create 2021-12-28
+ */
+public class TianXingConst {
+
+    //朋友圈
+    public static final Integer PYQ= 1;
+    //网易云
+    public static final Integer WYY= 2;
+    //经典台词
+    public static final Integer JDTC= 3;
+    //名人名言
+    public static final Integer MMMY= 4;
+    //Ten-API 一言
+    public static final Integer YY= 5;
+}

xjs-business/xjs-business-common/src/main/java/com/xjs/consts/TranslationTypeConst.java

@@ -0,0 +1,12 @@
+package com.xjs.consts;
+
+/**
+ * @author xiejs
+ * @desc  翻译类型常量
+ * @create 2021-12-25
+ */
+public interface TranslationTypeConst {
+    Integer BAIDU = 1;
+    Integer YOUDAO = 2;
+    Integer GOOGLE = 3;
+}

xjs-business/xjs-business-common/src/main/java/com/xjs/enums/StatusEnum.java

@@ -0,0 +1,33 @@
+package com.xjs.enums;
+
+import com.baomidou.mybatisplus.annotation.EnumValue;
+import com.fasterxml.jackson.annotation.JsonValue;
+
+/**
+ * @author xiejs
+ * @desc  状态类型枚举 需要返回什么参数就在toString实现 这个枚举需要mp在配置文件中配置扫描路径
+ * @create 2021-12-27
+ */
+public enum StatusEnum {
+
+    SUCCESS(1,"成功"),
+    ERROR(2,"失败");
+
+
+    private String desc;
+
+    @EnumValue//标记数据库存的值是value
+    @JsonValue
+    private final int value;
+
+    StatusEnum(int value, String desc) {
+        this.value = value;
+        this.desc = desc;
+    }
+
+
+    @Override
+    public String toString() {
+        return desc;
+    }
+}

xjs-business/xjs-business-common/src/main/java/com/xjs/exception/ApiException.java

@@ -0,0 +1,24 @@
+package com.xjs.exception;
+
+import lombok.extern.log4j.Log4j2;
+
+/**
+ * @author xiejs
+ * @desc
+ * @create 2021-12-27
+ */
+@Log4j2
+public class ApiException extends RuntimeException{
+    public ApiException() {
+        super();
+    }
+
+    public ApiException(String message) {
+        super(message);
+        log.error("调用第三方API异常----{}",message);
+    }
+
+    public ApiException(String message, Throwable cause) {
+        super(message, cause);
+    }
+}

xjs-business/xjs-business-common/src/main/java/com/xjs/exception/BusinessException.java

@@ -0,0 +1,24 @@
+package com.xjs.exception;
+
+import lombok.extern.log4j.Log4j2;
+
+/**
+ * @author xiejs
+ * @desc
+ * @create 2021-12-25
+ */
+@Log4j2
+public class BusinessException extends RuntimeException{
+    public BusinessException() {
+        super();
+    }
+
+    public BusinessException(String message) {
+        super(message);
+        log.error("业务异常----{}",message);
+    }
+
+    public BusinessException(String message, Throwable cause) {
+        super(message, cause);
+    }
+}

xjs-business/xjs-business-common/src/main/java/com/xjs/handler/MyMetaObjectHandler.java

@@ -0,0 +1,33 @@
+package com.xjs.handler;
+
+import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.ibatis.reflection.MetaObject;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+
+/**
+ * @author xiejs
+ * @desc  mp字段自动填充处理器
+ * @create 2021-12-27
+ */
+@Slf4j
+@Component
+public class MyMetaObjectHandler implements MetaObjectHandler {
+
+    @Override
+    public void insertFill(MetaObject metaObject) {
+        log.info("start insert fill ....");
+        //this.setFieldValByName("createTime", new Date(), metaObject);
+        this.strictInsertFill(metaObject, "createTime", Date.class,new Date()); // 起始版本 3.3.3(推荐)
+        this.strictInsertFill(metaObject, "updateTime", Date.class,new Date());
+    }
+
+    @Override
+    public void updateFill(MetaObject metaObject) {
+        log.info("start update fill ....");
+        //this.strictInsertFill(metaObject, "updateTime", LocalDateTime::now, LocalDateTime.class); // 起始版本 3.3.3(推荐)
+        this.strictInsertFill(metaObject, "updateTime", Date.class,new Date()); // 起始版本 3.3.3(推荐)
+    }
+    }

xjs-business/xjs-business-common/src/main/java/com/xjs/utils/ChineseUtil.java

@@ -0,0 +1,66 @@
+package com.xjs.utils;
+
+/**
+ * @author xiejs
+ * @desc  中文工具类
+ * @create 2021-12-29
+ */
+public class ChineseUtil {
+
+    /**
+     * 校验String是否全是中文
+     *
+     * @param name
+     *  被校验的字符串
+     * @return true代表全是汉字
+     */
+    public static boolean checkNameChese(String name) {
+        boolean res = true;
+        char[] cTemp = name.toCharArray();
+        for (int i = 0; i < name.length(); i++) {
+            if (!isChinese(cTemp[i])) {
+                res = false;
+                break;
+            }
+        }
+        return res;
+    }
+
+    /**
+     * 判定输入的是否是汉字
+     *
+     * @param c
+     *  被校验的字符
+     * @return true代表是汉字
+     */
+    public static boolean isChinese(char c) {
+        Character.UnicodeBlock ub = Character.UnicodeBlock.of(c);
+        if (ub == Character.UnicodeBlock.CJK_UNIFIED_IDEOGRAPHS
+                || ub == Character.UnicodeBlock.CJK_COMPATIBILITY_IDEOGRAPHS
+                || ub == Character.UnicodeBlock.CJK_UNIFIED_IDEOGRAPHS_EXTENSION_A
+                || ub == Character.UnicodeBlock.GENERAL_PUNCTUATION
+                || ub == Character.UnicodeBlock.CJK_SYMBOLS_AND_PUNCTUATION
+                || ub == Character.UnicodeBlock.HALFWIDTH_AND_FULLWIDTH_FORMS) {
+            return true;
+        }
+        return false;
+    }
+
+    /**
+
+     * 判断是否是字母
+
+     * @param str 传入字符串
+
+     * @return 是字母返回true，否则返回false
+
+     */
+
+    public static boolean isAlpha(String str) {
+
+        if(str==null) return false;
+
+        return str.matches("[a-zA-Z]+");
+
+    }
+}

xjs-business/xjs-business-common/src/main/java/com/xjs/validation/AddGroup.java

@@ -0,0 +1,9 @@
+package com.xjs.validation;
+
+/**
+ * @author xiejs
+ * @desc  添加校验分组
+ * @create 2021-12-30
+ */
+public interface AddGroup {
+}