feat: 单实例微服务一体化改造完成,版本更新为1.2.0

This commit is contained in:
qiufeng
2024-01-31 23:21:14 +08:00
parent 920abc94f8
commit f7a4fb5ee0
124 changed files with 120 additions and 139 deletions
+1 -1
View File
@@ -2,7 +2,7 @@
[![文档地址](https://img.shields.io/badge/docs-%E6%96%87%E6%A1%A3%E5%9C%B0%E5%9D%80-green)](http://www.mfish.com.cn)
[![License](https://img.shields.io/badge/license-Apache%20License%202.0-blue.svg)](https://github.com/mfish-qf/mfish-nocode/blob/main/LICENSE)
[![Version](https://img.shields.io/badge/version-1.1.0-brightgreen.svg)](https://github.com/mfish-qf/mfish-nocode/releases/tag/v1.1.0)
[![Version](https://img.shields.io/badge/version-1.2.0-brightgreen.svg)](https://github.com/mfish-qf/mfish-nocode/releases/tag/V1.2.0)
[![GitHub stars](https://img.shields.io/github/stars/mfish-qf/mfish-nocode.svg?style=social&label=Stars)](https://github.com/mfish-qf/mfish-nocode)
[![GitHub forks](https://img.shields.io/github/forks/mfish-qf/mfish-nocode.svg?style=social&label=Fork)](https://github.com/mfish-qf/mfish-nocode)
+1 -1
View File
@@ -33,7 +33,7 @@ CREATE TABLE `config_info` (
-- ----------------------------
-- Records of config_info
-- ----------------------------
INSERT INTO `config_info` VALUES (1, 'application-dev.yml', 'DEFAULT_GROUP', 'spring:\n autoconfigure:\n exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure\n redis:\n host: localhost\n port: 6379\n password: 1qaz@WSX\n database: 5\n timeout: 10s\n lettuce:\n pool:\n # 连接池中的最小空闲连接\n min-idle: 0\n # 连接池中的最大空闲连接\n max-idle: 8\n # 连接池的最大数据库连接数\n max-active: 8\n # #连接池最大阻塞等待时间(使用负值表示没有限制)\n max-wait: -1ms\n servlet:\n multipart:\n # 单个文件大小\n max-file-size: 1200MB\n # 设置总上传的文件大小\n max-request-size: 1200MB\n #增加下面属性防止swagger页面无法查看接口,报错no operations defined in spec错误\n mvc:\n pathmatch:\n matching-strategy: ANT_PATH_MATCHER\n# feign 配置\nfeign:\n sentinel:\n enabled: true\n okhttp:\n enabled: true\n httpclient:\n enabled: false\n client:\n config:\n default:\n connectTimeout: 10000\n readTimeout: 10000\n compression:\n request:\n enabled: false\n response:\n enabled: false\n\n# 暴露监控端点\nmanagement:\n endpoints:\n web:\n exposure:\n include: \'*\'\n endpoint:\n health:\n show-details: always\nlogging:\n config: classpath:logback-logstash.xml\nlog:\n level: info\n maxSize: 30MB\n# 临时缓存存储时间(单位:天)\ncache:\n temp:\n time: 7\nDBConnect:\n password:\n privateKey: 54f0e36b98cf63c3bc6185b61c6e4f2a6e1df3bdeb293a50d7b0bc66881c2419\nswagger:\n title: \'\'\n enabled: true\n description : 摸鱼框架接口文档\n license : Powered By mfish\n licenseUrl : http://www.mfish.com.cn\n version : 版本号:V1.1.0\n termsOfServiceUrl : http://www.mfish.com.cn\n contact:\n name: mfish\n email: qiufeng9862@qq.com\n url: http://www.mfish.com.cn\n needAuth : true\n', '040947504d3653a6da46f5defacbc6a0', '2023-01-11 12:10:11', '2024-01-26 17:23:43', NULL, '0:0:0:0:0:0:0:1', '', '', '', '', '', 'yaml', '', '');
INSERT INTO `config_info` VALUES (1, 'application-dev.yml', 'DEFAULT_GROUP', 'spring:\n autoconfigure:\n exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure\n redis:\n host: localhost\n port: 6379\n password: 1qaz@WSX\n database: 5\n timeout: 10s\n lettuce:\n pool:\n # 连接池中的最小空闲连接\n min-idle: 0\n # 连接池中的最大空闲连接\n max-idle: 8\n # 连接池的最大数据库连接数\n max-active: 8\n # #连接池最大阻塞等待时间(使用负值表示没有限制)\n max-wait: -1ms\n servlet:\n multipart:\n # 单个文件大小\n max-file-size: 1200MB\n # 设置总上传的文件大小\n max-request-size: 1200MB\n #增加下面属性防止swagger页面无法查看接口,报错no operations defined in spec错误\n mvc:\n pathmatch:\n matching-strategy: ANT_PATH_MATCHER\n# feign 配置\nfeign:\n sentinel:\n enabled: true\n okhttp:\n enabled: true\n httpclient:\n enabled: false\n client:\n config:\n default:\n connectTimeout: 10000\n readTimeout: 10000\n compression:\n request:\n enabled: false\n response:\n enabled: false\n\n# 暴露监控端点\nmanagement:\n endpoints:\n web:\n exposure:\n include: \'*\'\n endpoint:\n health:\n show-details: always\nlogging:\n config: classpath:logback-logstash.xml\nlog:\n level: info\n maxSize: 30MB\n# 临时缓存存储时间(单位:天)\ncache:\n temp:\n time: 7\nDBConnect:\n password:\n privateKey: 54f0e36b98cf63c3bc6185b61c6e4f2a6e1df3bdeb293a50d7b0bc66881c2419\nswagger:\n title: \'\'\n enabled: true\n description : 摸鱼框架接口文档\n license : Powered By mfish\n licenseUrl : http://www.mfish.com.cn\n version : 版本号:V1.2.0\n termsOfServiceUrl : http://www.mfish.com.cn\n contact:\n name: mfish\n email: qiufeng9862@qq.com\n url: http://www.mfish.com.cn\n needAuth : true\n', '040947504d3653a6da46f5defacbc6a0', '2023-01-11 12:10:11', '2024-01-26 17:23:43', NULL, '0:0:0:0:0:0:0:1', '', '', '', '', '', 'yaml', '', '');
INSERT INTO `config_info` VALUES (2, 'mf-gateway-dev.yml', 'DEFAULT_GROUP', 'spring: \n cloud:\n gateway:\n globalcors:\n cors-configurations:\n \'[/**]\':\n max-age: 3600\n allowed-origin-patterns: \"*\"\n allowed-headers: \"*\"\n allow-credentials: true\n allowed-methods:\n - GET\n - POST\n - DELETE\n - PUT\n - OPTION\n discovery:\n locator:\n lowerCaseServiceId: true\n enabled: true\n routes:\n # 认证中心\n - id: mf-oauth\n uri: lb://mf-oauth\n predicates:\n - Path=/oauth2/**\n filters:\n - CacheFilter\n # 验证码处理\n - CheckCodeFilter\n - StripPrefix=1\n # 测试中心\n - id: mf-test\n uri: lb://mf-test\n predicates:\n - Path=/test/**\n filters:\n - StripPrefix=1\n - id: mf-sys\n uri: lb://mf-sys\n predicates:\n - Path=/sys/**\n filters:\n - StripPrefix=1\n - id: mf-web\n uri: lb://mf-web\n predicates:\n - Path=/web/**\n filters:\n - StripPrefix=1\n - id: mf-storage\n uri: lb://mf-storage\n predicates:\n - Path=/storage/**\n filters:\n - StripPrefix=1\n - id: mf-scheduler\n uri: lb://mf-scheduler\n predicates:\n - Path=/scheduler/**\n filters:\n - StripPrefix=1\n - id: mf-openai\n uri: lb://mf-openai\n predicates:\n - Path=/ai/**\n filters:\n - StripPrefix=1\n - id: mf-nocode\n uri: lb://mf-nocode\n predicates:\n - Path=/nocode/**\n filters:\n - StripPrefix=1\n# 安全配置\nsecurity:\n # 验证码\n captcha:\n enabled: true\n type: math\n # 网关校验直接返回\n gatewayCheckCaptcha:\n # - /oauth2/authorize\n # 网关校验,自己服务返回\n selfCheckCaptcha:\n - /oauth2/authorize?loginType=user_password\n # 防止XSS攻击\n xss:\n enabled: true\n excludeUrls:\n # 不校验白名单\n ignore:\n whites:\n - /oauth2/accessToken\n - /oauth2/authorize\n - /oauth2/sendMsg\n - /oauth2/qrCodeLogin/*\n - /oauth2/wx/bind/**\n - /oauth2/static/**\n - /storage/file/*.*\n - /code/**\n - /test/**\n - /*/v2/api-docs', 'b8e766eb778292f9629607592b765da6', '2023-01-11 12:10:11', '2024-01-31 22:58:17', NULL, '0:0:0:0:0:0:0:1', '', '', '', '', '', 'yaml', '', '');
INSERT INTO `config_info` VALUES (3, 'mf-oauth-dev.yml', 'DEFAULT_GROUP', 'swagger:\n title: \'摸鱼认证中心\'\n needAuth: true\n# mybatis配置\nmybatis-plus:\n # 搜索指定包别名\n type-aliases-package: cn.com.mfish.oauth.mapper\n # 配置mapper的扫描,找到所有的mapper.xml映射文件\n mapper-locations: classpath*:cn/com/mfish/**/mapper/**/*Mapper.xml\n global-config:\n # 关闭MP3.0自带的banner\n banner: false\n db-config:\n #主键类型 0:\"数据库ID自增\",1:\"该类型为未设置主键类型\", 2:\"用户输入ID\",3:\"全局唯一ID (数字类型唯一ID)\", 4:\"全局唯一ID UUID\",5:\"字符串全局唯一ID (idWorker 的字符串表示)\";\n #id-type: 0\n # 默认数据库表下划线命名\n table-underline: true\n #逻辑删除 删除前\n logic-not-delete-value: 0\n #逻辑删除 删除后\n logic-delete-value: 1\n configuration:\n # 这个配置会将执行的sql打印出来,在开发或测试的时候可以用\n #log-impl: org.apache.ibatis.logging.stdout.StdOutImpl\n # 返回类型为Map,显示null对应的字段\n call-setters-on-nulls: true\n map-underscore-to-camel-case: true\n auto-mapping-behavior: full\n jdbc-type-for-null:\nspring: \n thymeleaf:\n cache: false\n datasource:\n druid:\n stat-view-servlet:\n enabled: true\n loginUsername: admin\n loginPassword: 123456\n dynamic:\n druid:\n initial-size: 5\n min-idle: 5\n maxActive: 20\n maxWait: 60000\n timeBetweenEvictionRunsMillis: 60000\n minEvictableIdleTimeMillis: 300000\n validationQuery: SELECT 1 FROM DUAL\n testWhileIdle: true\n testOnBorrow: false\n testOnReturn: false\n poolPreparedStatements: true\n maxPoolPreparedStatementPerConnectionSize: 20\n filters: stat,slf4j\n connectionProperties: druid.stat.mergeSql\\=true;druid.stat.slowSqlMillis\\=5000\n datasource:\n # 主库数据源\n master:\n driver-class-name: com.mysql.cj.jdbc.Driver\n url: jdbc:mysql://localhost:3306/mf_oauth?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8\n username: root\n password: 123456\n # 从库数据源\n # slave:\n # username: \n # password: \n # url: \n # driver-class-name: \n # seata: true # 开启seata代理,开启后默认每个数据源都代理,如果某个不需要代理可单独关闭\nredisCache:\n expire: 50400\n keyPrefix: sso_cache\nredisSession:\n expire: 50400\n keyPrefix: sso_session\nshiro:\n security:\n algorithmName: md5\n hashIterations: 2\n hexEncoded: true\noauth2:\n expire:\n code: 180\n token: 21600\n refreshToken: 604800\n login:\n mutex: false\n user:\n autoCreate: false\n token:\n sm4key: 143be1ae6ee10b048f7e441cec2a9803\nwechat:\n miniapp:\n appId: wx*************e34a3\n secret: a65e*************fa227', 'bb83f8df9e8633e644574516def8df6e', '2023-01-11 12:10:11', '2024-01-31 23:10:25', NULL, '0:0:0:0:0:0:0:1', '', '', '', '', '', 'yaml', '', '');
INSERT INTO `config_info` VALUES (4, 'sentinel-mf-gateway', 'DEFAULT_GROUP', '[\n {\n \"resource\": \"mf-oauth\",\n \"count\": 500,\n \"grade\": 1,\n \"limitApp\": \"default\",\n \"strategy\": 0,\n \"controlBehavior\": 0\n },\n {\n \"resource\": \"mf-sys\",\n \"count\": 500,\n \"grade\": 1,\n \"limitApp\": \"default\",\n \"strategy\": 0,\n \"controlBehavior\": 0\n },\n {\n \"resource\": \"mf-storage\",\n \"count\": 100,\n \"grade\": 1,\n \"limitApp\": \"default\",\n \"strategy\": 0,\n \"controlBehavior\": 0\n },\n {\n \"resource\": \"mf-scheduler\",\n \"count\": 100,\n \"grade\": 1,\n \"limitApp\": \"default\",\n \"strategy\": 0,\n \"controlBehavior\": 0\n }\n]', '07a23c3f1d6580115132bd0ba7897504', '2023-01-11 12:10:11', '2024-01-31 23:07:56', NULL, '0:0:0:0:0:0:0:1', '', '', '', '', '', 'text', '', '');
+1 -1
View File
@@ -5,7 +5,7 @@
<parent>
<artifactId>mf-api</artifactId>
<groupId>cn.com.mfish</groupId>
<version>1.1.0</version>
<version>1.2.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -18,7 +18,7 @@ import java.util.List;
* @description: 租户信息表
* @author: mfish
* @date: 2023-05-31
* @version: V1.1.0
* @version: V1.2.0
*/
@Data
@TableName("sso_tenant")
+1 -1
View File
@@ -5,7 +5,7 @@
<parent>
<artifactId>mf-api</artifactId>
<groupId>cn.com.mfish</groupId>
<version>1.1.0</version>
<version>1.2.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -18,7 +18,7 @@ import java.util.Date;
* @description: 任务日志
* @author: mfish
* @date: 2023-02-14
* @version: V1.1.0
* @version: V1.2.0
*/
@Data
@TableName("qrtz_job_log")
+1 -1
View File
@@ -6,7 +6,7 @@
<parent>
<groupId>cn.com.mfish</groupId>
<artifactId>mf-api</artifactId>
<version>1.1.0</version>
<version>1.2.0</version>
</parent>
<artifactId>mf-storage-api</artifactId>
@@ -14,7 +14,7 @@ import lombok.experimental.Accessors;
* @description: 文件存储
* @author: mfish
* @date: 2023-03-02
* @version: V1.1.0
* @version: V1.2.0
*/
@Data
@TableName("sys_storage")
+1 -1
View File
@@ -5,7 +5,7 @@
<parent>
<artifactId>mf-api</artifactId>
<groupId>cn.com.mfish</groupId>
<version>1.1.0</version>
<version>1.2.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -14,7 +14,7 @@ import lombok.experimental.Accessors;
* @description: 数据库连接
* @author: mfish
* @date: 2023-03-13
* @version: V1.1.0
* @version: V1.2.0
*/
@Data
@TableName("sys_db_connect")
@@ -14,7 +14,7 @@ import lombok.experimental.Accessors;
* @Description: 字典项
* @Author: mfish
* @date: 2023-01-03
* @Version: V1.1.0
* @Version: V1.2.0
*/
@Data
@TableName("sys_dict_item")
@@ -9,7 +9,7 @@ import lombok.experimental.Accessors;
* @description: 数据库连接
* @author: mfish
* @date: 2023-03-13
* @version: V1.1.0
* @version: V1.2.0
*/
@Data
@Accessors(chain = true)
+1 -1
View File
@@ -5,7 +5,7 @@
<parent>
<artifactId>mfish-nocode</artifactId>
<groupId>cn.com.mfish</groupId>
<version>1.1.0</version>
<version>1.2.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
+1 -1
View File
@@ -5,7 +5,7 @@
<parent>
<artifactId>mf-business</artifactId>
<groupId>cn.com.mfish</groupId>
<version>1.1.0</version>
<version>1.2.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -1,5 +1,5 @@
mfish:
version: 1.1.0
version: 1.2.0
# Tomcat
server:
port: 9226
+2 -3
View File
@@ -3,10 +3,9 @@
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>mfish-nocode</artifactId>
<artifactId>mf-business</artifactId>
<groupId>cn.com.mfish</groupId>
<version>1.1.0</version>
<relativePath>../../pom.xml</relativePath>
<version>1.2.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -1,5 +1,5 @@
mfish:
version: 1.1.0
version: 1.2.0
# Tomcat
server:
port: 9226
+1 -1
View File
@@ -5,7 +5,7 @@
<parent>
<artifactId>mf-business</artifactId>
<groupId>cn.com.mfish</groupId>
<version>1.1.0</version>
<version>1.2.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -33,7 +33,7 @@ import java.util.List;
* @description: 数据库连接
* @author: mfish
* @date: 2023-03-13
* @version: V1.1.0
* @version: V1.2.0
*/
@Slf4j
@Api(tags = "数据库连接")
@@ -15,7 +15,7 @@ import lombok.experimental.Accessors;
* @Description: 字典
* @Author: mfish
* @date: 2023-01-03
* @Version: V1.1.0
* @Version: V1.2.0
*/
@Data
@TableName("sys_dict")
@@ -14,7 +14,7 @@ import lombok.experimental.Accessors;
* @description: 界面配置
* @author: mfish
* @date: 2023-03-07
* @version: V1.1.0
* @version: V1.2.0
*/
@Data
@TableName("sys_config")
@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
* @description: 数据库连接
* @author: mfish
* @date: 2023-03-13
* @version: V1.1.0
* @version: V1.2.0
*/
public interface DbConnectMapper extends BaseMapper<DbConnect> {
}
@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
* @Description: 字典项
* @Author: mfish
* @date: 2023-01-03
* @Version: V1.1.0
* @Version: V1.2.0
*/
public interface DictItemMapper extends BaseMapper<DictItem> {
@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
* @description: 界面配置
* @author: mfish
* @date: 2023-03-07
* @version: V1.1.0
* @version: V1.2.0
*/
public interface SysConfigMapper extends BaseMapper<SysConfig> {
@@ -9,7 +9,7 @@ import lombok.experimental.Accessors;
* @description: 界面配置
* @author: mfish
* @date: 2023-03-07
* @version: V1.1.0
* @version: V1.2.0
*/
@Data
@Accessors(chain = true)
@@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
* @description: 数据库连接
* @author: mfish
* @date: 2023-03-13
* @version: V1.1.0
* @version: V1.2.0
*/
public interface DbConnectService extends IService<DbConnect> {
Result<DbConnect> insertConnect(DbConnect dbConnect);
@@ -10,7 +10,7 @@ import java.util.List;
* @Description: 字典项
* @Author: mfish
* @date: 2023-01-03
* @Version: V1.1.0
* @Version: V1.2.0
*/
public interface DictItemService extends IService<DictItem> {
/**
@@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
* @Description: 字典
* @Author: mfish
* @date: 2023-01-03
* @Version: V1.1.0
* @Version: V1.2.0
*/
public interface DictService extends IService<Dict> {
Result<Dict> updateDict(Dict dict);
@@ -14,7 +14,7 @@ import java.util.List;
* @Description: 字典项
* @Author: mfish
* @date: 2023-01-03
* @Version: V1.1.0
* @Version: V1.2.0
*/
@Service
public class DictItemServiceImpl extends ServiceImpl<DictItemMapper, DictItem> implements DictItemService {
@@ -20,7 +20,7 @@ import java.util.List;
* @Description: 字典
* @Author: mfish
* @date: 2023-01-03
* @Version: V1.1.0
* @Version: V1.2.0
*/
@Service
public class DictServiceImpl extends ServiceImpl<DictMapper, Dict> implements DictService {
@@ -14,7 +14,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
* @description: 界面配置
* @author: mfish
* @date: 2023-03-07
* @version: V1.1.0
* @version: V1.2.0
*/
@Service
public class SysConfigServiceImpl extends ServiceImpl<SysConfigMapper, SysConfig> implements SysConfigService {
+1 -1
View File
@@ -5,7 +5,7 @@
<parent>
<artifactId>mf-business</artifactId>
<groupId>cn.com.mfish</groupId>
<version>1.1.0</version>
<version>1.2.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -1,5 +1,5 @@
mfish:
version: 1.1.0
version: 1.2.0
# Tomcat
server:
port: 9225
+1 -1
View File
@@ -5,7 +5,7 @@
<parent>
<artifactId>mfish-nocode</artifactId>
<groupId>cn.com.mfish</groupId>
<version>1.1.0</version>
<version>1.2.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
+1 -1
View File
@@ -5,7 +5,7 @@
<parent>
<artifactId>mf-common</artifactId>
<groupId>cn.com.mfish</groupId>
<version>1.1.0</version>
<version>1.2.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
+1 -1
View File
@@ -5,7 +5,7 @@
<parent>
<artifactId>mf-common</artifactId>
<groupId>cn.com.mfish</groupId>
<version>1.1.0</version>
<version>1.2.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>mf-common-captcha</artifactId>
+1 -1
View File
@@ -6,7 +6,7 @@
<parent>
<artifactId>mf-common</artifactId>
<groupId>cn.com.mfish</groupId>
<version>1.1.0</version>
<version>1.2.0</version>
</parent>
<artifactId>mf-common-code</artifactId>
@@ -23,7 +23,7 @@ import java.util.Date;
* @description: ${tableInfo.tableComment}
* @author: mfish
* @date: ${.now?string["yyyy-MM-dd"]}
* @version: V1.1.0
* @version: V1.2.0
*/
@Data
@TableName("${tableInfo.tableName}")
@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
* @description: ${tableInfo.tableComment}
* @author: mfish
* @date: ${.now?string["yyyy-MM-dd"]}
* @version: V1.1.0
* @version: V1.2.0
*/
public interface ${entityName}Mapper extends BaseMapper<${entityName}> {
@@ -11,7 +11,7 @@ import lombok.experimental.Accessors;
* @description: ${tableInfo.tableComment}
* @author: mfish
* @date: ${.now?string["yyyy-MM-dd"]}
* @version: V1.1.0
* @version: V1.2.0
*/
@Data
@Accessors(chain = true)
@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
* @description: ${tableInfo.tableComment}
* @author: mfish
* @date: ${.now?string["yyyy-MM-dd"]}
* @version: V1.1.0
* @version: V1.2.0
*/
public interface ${entityName}Service extends IService<${entityName}> {
@@ -4,7 +4,7 @@ import { BaseEntity, PageResult, ReqPage } from "/@/api/model/BaseModel";
* @description: ${tableInfo.tableComment}
* @author: mfish
* @date: ${.now?string["yyyy-MM-dd"]}
* @version: V1.1.0
* @version: V1.2.0
*/
export interface ${entityName} extends BaseEntity<<#if tableInfo.idType==''||tableInfo.idType=='String'>string<#else>number</#if>> {
<#list tableInfo.columns as fieldInfo>
@@ -2,7 +2,7 @@
@description: ${tableInfo.tableComment}
@author: mfish
@date: ${.now?string["yyyy-MM-dd"]}
@version: V1.1.0
@version: V1.2.0
-->
<template>
<div>
@@ -23,7 +23,7 @@ import java.util.Date;
* @description: ${tableInfo.tableComment}
* @author: mfish
* @date: ${.now?string["yyyy-MM-dd"]}
* @version: V1.1.0
* @version: V1.2.0
*/
@Data
@TableName("${tableInfo.tableName}")
@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
* @description: ${tableInfo.tableComment}
* @author: mfish
* @date: ${.now?string["yyyy-MM-dd"]}
* @version: V1.1.0
* @version: V1.2.0
*/
public interface ${entityName}Mapper extends BaseMapper<${entityName}> {
@@ -11,7 +11,7 @@ import lombok.experimental.Accessors;
* @description: ${tableInfo.tableComment}
* @author: mfish
* @date: ${.now?string["yyyy-MM-dd"]}
* @version: V1.1.0
* @version: V1.2.0
*/
@Data
@Accessors(chain = true)
@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
* @description: ${tableInfo.tableComment}
* @author: mfish
* @date: ${.now?string["yyyy-MM-dd"]}
* @version: V1.1.0
* @version: V1.2.0
*/
public interface ${entityName}Service extends IService<${entityName}> {
@@ -4,7 +4,7 @@ import { BaseEntity, PageResult, ReqPage } from "/@/api/model/BaseModel";
* @description: ${tableInfo.tableComment}
* @author: mfish
* @date: ${.now?string["yyyy-MM-dd"]}
* @version: V1.1.0
* @version: V1.2.0
*/
export interface ${entityName} extends BaseEntity<<#if tableInfo.idType==''||tableInfo.idType=='String'>string<#else>number</#if>> {
<#list tableInfo.columns as fieldInfo>
@@ -2,7 +2,7 @@
@description: ${tableInfo.tableComment}
@author: mfish
@date: ${.now?string["yyyy-MM-dd"]}
@version: V1.1.0
@version: V1.2.0
-->
<template>
<div>
@@ -1,3 +0,0 @@
artifactId=mf-common-code
groupId=cn.com.mfish
version=1.1.0
@@ -1,8 +0,0 @@
cn\com\mfish\common\code\config\FreemarkerConfig.class
cn\com\mfish\common\code\common\MatchType.class
cn\com\mfish\common\code\common\MatchType$1.class
cn\com\mfish\common\code\entity\CodeInfo.class
cn\com\mfish\common\code\entity\SearchInfo.class
cn\com\mfish\common\code\common\FreemarkerUtils.class
cn\com\mfish\common\code\common\DefaultField.class
cn\com\mfish\common\code\config\properties\FreemarkerProperties.class
@@ -1,7 +0,0 @@
E:\javacode\mfish-nocode\mf-common\mf-common-code\src\main\java\cn\com\mfish\common\code\common\DefaultField.java
E:\javacode\mfish-nocode\mf-common\mf-common-code\src\main\java\cn\com\mfish\common\code\common\MatchType.java
E:\javacode\mfish-nocode\mf-common\mf-common-code\src\main\java\cn\com\mfish\common\code\common\FreemarkerUtils.java
E:\javacode\mfish-nocode\mf-common\mf-common-code\src\main\java\cn\com\mfish\common\code\entity\CodeInfo.java
E:\javacode\mfish-nocode\mf-common\mf-common-code\src\main\java\cn\com\mfish\common\code\entity\SearchInfo.java
E:\javacode\mfish-nocode\mf-common\mf-common-code\src\main\java\cn\com\mfish\common\code\config\FreemarkerConfig.java
E:\javacode\mfish-nocode\mf-common\mf-common-code\src\main\java\cn\com\mfish\common\code\config\properties\FreemarkerProperties.java
+1 -1
View File
@@ -5,7 +5,7 @@
<parent>
<artifactId>mf-common</artifactId>
<groupId>cn.com.mfish</groupId>
<version>1.1.0</version>
<version>1.2.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>mf-common-core</artifactId>
+1 -1
View File
@@ -5,7 +5,7 @@
<parent>
<artifactId>mf-common</artifactId>
<groupId>cn.com.mfish</groupId>
<version>1.1.0</version>
<version>1.2.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
+1 -1
View File
@@ -5,7 +5,7 @@
<parent>
<artifactId>mf-common</artifactId>
<groupId>cn.com.mfish</groupId>
<version>1.1.0</version>
<version>1.2.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
+1 -1
View File
@@ -5,7 +5,7 @@
<parent>
<artifactId>mf-common</artifactId>
<groupId>cn.com.mfish</groupId>
<version>1.1.0</version>
<version>1.2.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<description>多数据源配置</description>
+1 -1
View File
@@ -5,7 +5,7 @@
<parent>
<artifactId>mf-common</artifactId>
<groupId>cn.com.mfish</groupId>
<version>1.1.0</version>
<version>1.2.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
+1 -1
View File
@@ -5,7 +5,7 @@
<parent>
<artifactId>mf-common</artifactId>
<groupId>cn.com.mfish</groupId>
<version>1.1.0</version>
<version>1.2.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
* @description: 系统日志
* @author: mfish
* @date: 2023-01-08
* @version: V1.1.0
* @version: V1.2.0
*/
public interface SysLogMapper extends BaseMapper<SysLog> {
@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
* @description: 系统日志
* @author: mfish
* @date: 2023-01-08
* @version: V1.1.0
* @version: V1.2.0
*/
public interface SysLogService extends IService<SysLog> {
@@ -10,7 +10,7 @@ import org.springframework.stereotype.Service;
* @description: 系统日志
* @author: mfish
* @date: 2023-01-08
* @version: V1.1.0
* @version: V1.2.0
*/
@Service
public class SysLogServiceImpl extends ServiceImpl<SysLogMapper, SysLog> implements SysLogService {
+1 -1
View File
@@ -5,7 +5,7 @@
<parent>
<artifactId>mf-common</artifactId>
<groupId>cn.com.mfish</groupId>
<version>1.1.0</version>
<version>1.2.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<description>摸鱼认证中心核心</description>
@@ -9,7 +9,7 @@ import lombok.experimental.Accessors;
* @Description: 用户信息
* @Author: mfish
* @date: 2022-11-13
* @Version: V1.1.0
* @Version: V1.2.0
*/
@Data
@Accessors(chain = true)
+1 -1
View File
@@ -5,7 +5,7 @@
<parent>
<artifactId>mf-common</artifactId>
<groupId>cn.com.mfish</groupId>
<version>1.1.0</version>
<version>1.2.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>mf-common-redis</artifactId>
+1 -1
View File
@@ -5,7 +5,7 @@
<parent>
<artifactId>mf-common</artifactId>
<groupId>cn.com.mfish</groupId>
<version>1.1.0</version>
<version>1.2.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
+1 -1
View File
@@ -5,7 +5,7 @@
<parent>
<artifactId>mf-common</artifactId>
<groupId>cn.com.mfish</groupId>
<version>1.1.0</version>
<version>1.2.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<description>
@@ -24,7 +24,7 @@ public class SwaggerProperties {
private String termsOfServiceUrl = "";
private String license = "";
private String licenseUrl = "";
private String version = "版本号:V1.1.0";
private String version = "版本号:V1.2.0";
private MyContact contact;
//是否需要头部验证 默认:true(需要)
private Boolean needAuth = true;
+1 -1
View File
@@ -5,7 +5,7 @@
<parent>
<artifactId>mf-common</artifactId>
<groupId>cn.com.mfish</groupId>
<version>1.1.0</version>
<version>1.2.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
+1 -1
View File
@@ -5,7 +5,7 @@
<parent>
<groupId>cn.com.mfish</groupId>
<artifactId>mfish-nocode</artifactId>
<version>1.1.0</version>
<version>1.2.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>mf-common</artifactId>
+1 -1
View File
@@ -5,7 +5,7 @@
<parent>
<artifactId>mfish-nocode</artifactId>
<groupId>cn.com.mfish</groupId>
<version>1.1.0</version>
<version>1.2.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
+1 -1
View File
@@ -5,7 +5,7 @@
<parent>
<artifactId>mfish-nocode</artifactId>
<groupId>cn.com.mfish</groupId>
<version>1.1.0</version>
<version>1.2.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
+1 -1
View File
@@ -1,5 +1,5 @@
mfish:
version: 1.1.0
version: 1.2.0
# Tomcat
server:
port: 9223
+1 -1
View File
@@ -5,7 +5,7 @@
<parent>
<artifactId>mfish-nocode</artifactId>
<groupId>cn.com.mfish</groupId>
<version>1.1.0</version>
<version>1.2.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -27,7 +27,7 @@ import java.util.List;
* @description: 客户端信息
* @author: mfish
* @date: 2023-05-12
* @version: V1.1.0
* @version: V1.2.0
*/
@Slf4j
@Api(tags = "客户端信息")
@@ -30,7 +30,7 @@ import java.util.stream.Collectors;
* @Description: 角色信息表
* @Author: mfish
* @date: 2022-09-20
* @Version: V1.1.0
* @Version: V1.2.0
*/
@Slf4j
@Api(tags = "角色信息表")
@@ -18,7 +18,7 @@ import java.util.List;
* @Description: 角色信息表
* @Author: mfish
* @date: 2022-09-20
* @Version: V1.1.0
* @Version: V1.2.0
*/
@Data
@TableName("sso_role")
@@ -13,7 +13,7 @@ import java.util.List;
* @description: 租户信息表
* @author: mfish
* @date: 2023-05-31
* @version: V1.1.0
* @version: V1.2.0
*/
public interface SsoTenantMapper extends BaseMapper<SsoTenant> {
List<TenantVo> queryList(@Param("reqSsoTenant") ReqSsoTenant reqSsoTenant);
@@ -9,7 +9,7 @@ import lombok.experimental.Accessors;
* @Description: 角色信息表
* @Author: mfish
* @date: 2022-09-20
* @Version: V1.1.0
* @Version: V1.2.0
*/
@Data
@Accessors(chain = true)
@@ -9,7 +9,7 @@ import lombok.experimental.Accessors;
* @description: 租户信息表
* @author: mfish
* @date: 2023-05-31
* @version: V1.1.0
* @version: V1.2.0
*/
@Data
@Accessors(chain = true)
@@ -13,7 +13,7 @@ import java.util.List;
* @description: 租户信息表
* @author: mfish
* @date: 2023-05-31
* @version: V1.1.0
* @version: V1.2.0
*/
public interface SsoTenantService extends IService<SsoTenant> {
List<TenantVo> queryList(ReqSsoTenant reqSsoTenant, ReqPage reqPage);
@@ -27,7 +27,7 @@ import java.util.stream.Collectors;
* @Description: 菜单权限表
* @Author: mfish
* @date: 2022-09-21
* @Version: V1.1.0
* @Version: V1.2.0
*/
@Service
public class SsoMenuServiceImpl extends ServiceImpl<SsoMenuMapper, SsoMenu> implements SsoMenuService {
@@ -29,7 +29,7 @@ import java.util.stream.Collectors;
* @Description: 组织结构表
* @Author: mfish
* @date: 2022-09-20
* @Version: V1.1.0
* @Version: V1.2.0
*/
@Service
@Slf4j
@@ -21,7 +21,7 @@ import java.util.concurrent.CompletableFuture;
* @Description: 角色信息表
* @Author: mfish
* @date: 2022-09-20
* @Version: V1.1.0
* @Version: V1.2.0
*/
@Service
@Slf4j
+1 -1
View File
@@ -5,7 +5,7 @@
<parent>
<artifactId>mfish-nocode</artifactId>
<groupId>cn.com.mfish</groupId>
<version>1.1.0</version>
<version>1.2.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -28,7 +28,7 @@ import java.util.stream.Collectors;
* @description: 定时调度任务
* @author: mfish
* @date: 2023-02-03
* @version: V1.1.0
* @version: V1.2.0
*/
@Slf4j
@Api(tags = "定时调度任务")
@@ -28,7 +28,7 @@ import java.util.Date;
* @description: 任务日志
* @author: mfish
* @date: 2023-02-14
* @version: V1.1.0
* @version: V1.2.0
*/
@Slf4j
@Api(tags = "任务日志")
@@ -26,7 +26,7 @@ import java.util.List;
* @description: 任务订阅表
* @author: mfish
* @date: 2023-02-20
* @version: V1.1.0
* @version: V1.2.0
*/
@Slf4j
@Api(tags = "任务订阅表")
@@ -17,7 +17,7 @@ import java.util.List;
* @description: 定时调度任务
* @author: mfish
* @date: 2023-02-20
* @version: V1.1.0
* @version: V1.2.0
*/
@Data
@TableName("qrtz_job")
@@ -16,7 +16,7 @@ import java.util.Date;
* @description: 任务订阅表
* @author: mfish
* @date: 2023-02-20
* @version: V1.1.0
* @version: V1.2.0
*/
@Data
@TableName("qrtz_job_subscribe")
@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
* @description: 任务日志
* @author: mfish
* @date: 2023-02-14
* @version: V1.1.0
* @version: V1.2.0
*/
public interface JobLogMapper extends BaseMapper<JobLog> {
@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
* @description: 定时调度任务
* @author: mfish
* @date: 2023-02-03
* @version: V1.1.0
* @version: V1.2.0
*/
public interface JobMapper extends BaseMapper<Job> {
@@ -10,7 +10,7 @@ import java.util.List;
* @description: 任务订阅表
* @author: mfish
* @date: 2023-02-20
* @version: V1.1.0
* @version: V1.2.0
*/
public interface JobSubscribeMapper extends BaseMapper<JobSubscribe> {
int insertJobSubscribes(@Param("jobSubscribeList") List<JobSubscribe> jobSubscribeList);
@@ -9,7 +9,7 @@ import lombok.experimental.Accessors;
* @description: 定时调度任务
* @author: mfish
* @date: 2023-02-03
* @version: V1.1.0
* @version: V1.2.0
*/
@Data
@Accessors(chain = true)
@@ -10,7 +10,7 @@ import lombok.experimental.Accessors;
* @description: 任务日志
* @author: mfish
* @date: 2023-02-14
* @version: V1.1.0
* @version: V1.2.0
*/
@EqualsAndHashCode(callSuper = true)
@Data
@@ -9,7 +9,7 @@ import lombok.experimental.Accessors;
* @description: 任务订阅表
* @author: mfish
* @date: 2023-02-20
* @version: V1.1.0
* @version: V1.2.0
*/
@Data
@Accessors(chain = true)
@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
* @description: 任务日志
* @author: mfish
* @date: 2023-02-14
* @version: V1.1.0
* @version: V1.2.0
*/
public interface JobLogService extends IService<JobLog> {
@@ -9,7 +9,7 @@ import org.quartz.SchedulerException;
* @description: 定时调度任务
* @author: mfish
* @date: 2023-02-03
* @version: V1.1.0
* @version: V1.2.0
*/
public interface JobService extends IService<Job> {
Result<Job> insertJob(Job job) throws SchedulerException, ClassNotFoundException;

Some files were not shown because too many files have changed in this diff Show More