commit:同步2.1版本

This commit is contained in:
Jerry
2021-12-16 21:49:09 +08:00
parent 81bb8ea64e
commit c76388f593
552 changed files with 5641 additions and 2583 deletions

View File

@@ -4,7 +4,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>common</artifactId>
<groupId>com.flow.demo</groupId>
<groupId>com.orangeforms</groupId>
<version>1.0.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -16,7 +16,7 @@
<dependencies>
<dependency>
<groupId>com.flow.demo</groupId>
<groupId>com.orangeforms</groupId>
<artifactId>common-online</artifactId>
<version>1.0.0</version>
</dependency>

View File

@@ -1,4 +1,4 @@
package com.flow.demo.common.online.api.config;
package com.orangeforms.common.online.api.config;
import org.springframework.boot.context.properties.EnableConfigurationProperties;

View File

@@ -1,4 +1,4 @@
package com.flow.demo.common.online.api.config;
package com.orangeforms.common.online.api.config;
import lombok.Data;
import org.springframework.boot.context.properties.ConfigurationProperties;

View File

@@ -1,23 +1,23 @@
package com.flow.demo.common.online.api.controller;
package com.orangeforms.common.online.api.controller;
import cn.hutool.core.collection.CollUtil;
import cn.jimmyshi.beanquery.BeanQuery;
import com.flow.demo.common.core.annotation.MyRequestBody;
import com.flow.demo.common.core.constant.ErrorCodeEnum;
import com.flow.demo.common.core.object.*;
import com.flow.demo.common.core.util.MyCommonUtil;
import com.flow.demo.common.core.util.MyModelUtil;
import com.flow.demo.common.core.util.MyPageUtil;
import com.flow.demo.common.core.validator.UpdateGroup;
import com.flow.demo.common.online.dto.OnlineColumnDto;
import com.flow.demo.common.online.dto.OnlineColumnRuleDto;
import com.flow.demo.common.online.dto.OnlineRuleDto;
import com.flow.demo.common.online.model.*;
import com.flow.demo.common.online.object.SqlTableColumn;
import com.flow.demo.common.online.service.*;
import com.flow.demo.common.online.vo.OnlineColumnRuleVo;
import com.flow.demo.common.online.vo.OnlineColumnVo;
import com.flow.demo.common.online.vo.OnlineRuleVo;
import com.orangeforms.common.core.annotation.MyRequestBody;
import com.orangeforms.common.core.constant.ErrorCodeEnum;
import com.orangeforms.common.core.object.*;
import com.orangeforms.common.core.util.MyCommonUtil;
import com.orangeforms.common.core.util.MyModelUtil;
import com.orangeforms.common.core.util.MyPageUtil;
import com.orangeforms.common.core.validator.UpdateGroup;
import com.orangeforms.common.online.dto.OnlineColumnDto;
import com.orangeforms.common.online.dto.OnlineColumnRuleDto;
import com.orangeforms.common.online.dto.OnlineRuleDto;
import com.orangeforms.common.online.model.*;
import com.orangeforms.common.online.object.SqlTableColumn;
import com.orangeforms.common.online.service.*;
import com.orangeforms.common.online.vo.OnlineColumnRuleVo;
import com.orangeforms.common.online.vo.OnlineColumnVo;
import com.orangeforms.common.online.vo.OnlineRuleVo;
import com.github.pagehelper.page.PageMethod;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;

View File

@@ -1,21 +1,21 @@
package com.flow.demo.common.online.api.controller;
package com.orangeforms.common.online.api.controller;
import cn.hutool.core.collection.CollUtil;
import com.flow.demo.common.core.annotation.MyRequestBody;
import com.flow.demo.common.core.constant.ErrorCodeEnum;
import com.flow.demo.common.core.object.*;
import com.flow.demo.common.core.util.MyCommonUtil;
import com.flow.demo.common.core.util.MyModelUtil;
import com.flow.demo.common.core.util.MyPageUtil;
import com.flow.demo.common.core.validator.AddGroup;
import com.flow.demo.common.core.validator.UpdateGroup;
import com.flow.demo.common.online.dto.OnlineDatasourceDto;
import com.flow.demo.common.online.model.*;
import com.flow.demo.common.online.model.constant.PageType;
import com.flow.demo.common.online.object.SqlTable;
import com.flow.demo.common.online.object.SqlTableColumn;
import com.flow.demo.common.online.service.*;
import com.flow.demo.common.online.vo.OnlineDatasourceVo;
import com.orangeforms.common.core.annotation.MyRequestBody;
import com.orangeforms.common.core.constant.ErrorCodeEnum;
import com.orangeforms.common.core.object.*;
import com.orangeforms.common.core.util.MyCommonUtil;
import com.orangeforms.common.core.util.MyModelUtil;
import com.orangeforms.common.core.util.MyPageUtil;
import com.orangeforms.common.core.validator.AddGroup;
import com.orangeforms.common.core.validator.UpdateGroup;
import com.orangeforms.common.online.dto.OnlineDatasourceDto;
import com.orangeforms.common.online.model.*;
import com.orangeforms.common.online.model.constant.PageType;
import com.orangeforms.common.online.object.SqlTable;
import com.orangeforms.common.online.object.SqlTableColumn;
import com.orangeforms.common.online.service.*;
import com.orangeforms.common.online.vo.OnlineDatasourceVo;
import com.github.pagehelper.page.PageMethod;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;

View File

@@ -1,20 +1,20 @@
package com.flow.demo.common.online.api.controller;
package com.orangeforms.common.online.api.controller;
import cn.hutool.core.collection.CollUtil;
import com.flow.demo.common.core.annotation.MyRequestBody;
import com.flow.demo.common.core.constant.ErrorCodeEnum;
import com.flow.demo.common.core.object.*;
import com.flow.demo.common.core.util.MyCommonUtil;
import com.flow.demo.common.core.util.MyModelUtil;
import com.flow.demo.common.core.util.MyPageUtil;
import com.flow.demo.common.core.validator.AddGroup;
import com.flow.demo.common.core.validator.UpdateGroup;
import com.flow.demo.common.online.dto.OnlineDatasourceRelationDto;
import com.flow.demo.common.online.model.*;
import com.flow.demo.common.online.object.SqlTable;
import com.flow.demo.common.online.object.SqlTableColumn;
import com.flow.demo.common.online.service.*;
import com.flow.demo.common.online.vo.OnlineDatasourceRelationVo;
import com.orangeforms.common.core.annotation.MyRequestBody;
import com.orangeforms.common.core.constant.ErrorCodeEnum;
import com.orangeforms.common.core.object.*;
import com.orangeforms.common.core.util.MyCommonUtil;
import com.orangeforms.common.core.util.MyModelUtil;
import com.orangeforms.common.core.util.MyPageUtil;
import com.orangeforms.common.core.validator.AddGroup;
import com.orangeforms.common.core.validator.UpdateGroup;
import com.orangeforms.common.online.dto.OnlineDatasourceRelationDto;
import com.orangeforms.common.online.model.*;
import com.orangeforms.common.online.object.SqlTable;
import com.orangeforms.common.online.object.SqlTableColumn;
import com.orangeforms.common.online.service.*;
import com.orangeforms.common.online.vo.OnlineDatasourceRelationVo;
import com.github.pagehelper.page.PageMethod;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;

View File

@@ -1,19 +1,19 @@
package com.flow.demo.common.online.api.controller;
package com.orangeforms.common.online.api.controller;
import com.flow.demo.common.core.annotation.MyRequestBody;
import com.flow.demo.common.core.constant.ErrorCodeEnum;
import com.flow.demo.common.core.object.MyOrderParam;
import com.flow.demo.common.core.object.MyPageData;
import com.flow.demo.common.core.object.MyPageParam;
import com.flow.demo.common.core.object.ResponseResult;
import com.flow.demo.common.core.util.MyModelUtil;
import com.flow.demo.common.core.util.MyPageUtil;
import com.flow.demo.common.online.dto.OnlineDblinkDto;
import com.flow.demo.common.online.model.OnlineDblink;
import com.flow.demo.common.online.object.SqlTable;
import com.flow.demo.common.online.object.SqlTableColumn;
import com.flow.demo.common.online.service.OnlineDblinkService;
import com.flow.demo.common.online.vo.OnlineDblinkVo;
import com.orangeforms.common.core.annotation.MyRequestBody;
import com.orangeforms.common.core.constant.ErrorCodeEnum;
import com.orangeforms.common.core.object.MyOrderParam;
import com.orangeforms.common.core.object.MyPageData;
import com.orangeforms.common.core.object.MyPageParam;
import com.orangeforms.common.core.object.ResponseResult;
import com.orangeforms.common.core.util.MyModelUtil;
import com.orangeforms.common.core.util.MyPageUtil;
import com.orangeforms.common.online.dto.OnlineDblinkDto;
import com.orangeforms.common.online.model.OnlineDblink;
import com.orangeforms.common.online.object.SqlTable;
import com.orangeforms.common.online.object.SqlTableColumn;
import com.orangeforms.common.online.service.OnlineDblinkService;
import com.orangeforms.common.online.vo.OnlineDblinkVo;
import com.github.pagehelper.page.PageMethod;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;

View File

@@ -1,16 +1,16 @@
package com.flow.demo.common.online.api.controller;
package com.orangeforms.common.online.api.controller;
import com.flow.demo.common.core.annotation.MyRequestBody;
import com.flow.demo.common.core.constant.ErrorCodeEnum;
import com.flow.demo.common.core.object.*;
import com.flow.demo.common.core.util.MyCommonUtil;
import com.flow.demo.common.core.util.MyModelUtil;
import com.flow.demo.common.core.util.MyPageUtil;
import com.flow.demo.common.core.validator.UpdateGroup;
import com.flow.demo.common.online.dto.OnlineDictDto;
import com.flow.demo.common.online.model.OnlineDict;
import com.flow.demo.common.online.service.OnlineDictService;
import com.flow.demo.common.online.vo.OnlineDictVo;
import com.orangeforms.common.core.annotation.MyRequestBody;
import com.orangeforms.common.core.constant.ErrorCodeEnum;
import com.orangeforms.common.core.object.*;
import com.orangeforms.common.core.util.MyCommonUtil;
import com.orangeforms.common.core.util.MyModelUtil;
import com.orangeforms.common.core.util.MyPageUtil;
import com.orangeforms.common.core.validator.UpdateGroup;
import com.orangeforms.common.online.dto.OnlineDictDto;
import com.orangeforms.common.online.model.OnlineDict;
import com.orangeforms.common.online.service.OnlineDictService;
import com.orangeforms.common.online.vo.OnlineDictVo;
import com.github.pagehelper.page.PageMethod;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;

View File

@@ -1,18 +1,18 @@
package com.flow.demo.common.online.api.controller;
package com.orangeforms.common.online.api.controller;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.json.JSONObject;
import com.flow.demo.common.core.annotation.MyRequestBody;
import com.flow.demo.common.core.constant.ErrorCodeEnum;
import com.flow.demo.common.core.object.*;
import com.flow.demo.common.core.util.MyCommonUtil;
import com.flow.demo.common.core.util.MyModelUtil;
import com.flow.demo.common.core.util.MyPageUtil;
import com.flow.demo.common.core.validator.UpdateGroup;
import com.flow.demo.common.online.dto.OnlineFormDto;
import com.flow.demo.common.online.model.*;
import com.flow.demo.common.online.service.*;
import com.flow.demo.common.online.vo.OnlineFormVo;
import com.orangeforms.common.core.annotation.MyRequestBody;
import com.orangeforms.common.core.constant.ErrorCodeEnum;
import com.orangeforms.common.core.object.*;
import com.orangeforms.common.core.util.MyCommonUtil;
import com.orangeforms.common.core.util.MyModelUtil;
import com.orangeforms.common.core.util.MyPageUtil;
import com.orangeforms.common.core.validator.UpdateGroup;
import com.orangeforms.common.online.dto.OnlineFormDto;
import com.orangeforms.common.online.model.*;
import com.orangeforms.common.online.service.*;
import com.orangeforms.common.online.vo.OnlineFormVo;
import com.github.pagehelper.page.PageMethod;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;

View File

@@ -1,26 +1,26 @@
package com.flow.demo.common.online.api.controller;
package com.orangeforms.common.online.api.controller;
import com.alibaba.fastjson.JSONObject;
import com.flow.demo.common.core.annotation.MyRequestBody;
import com.flow.demo.common.core.constant.ErrorCodeEnum;
import com.flow.demo.common.core.object.*;
import com.flow.demo.common.core.util.MyCommonUtil;
import com.flow.demo.common.core.util.MyModelUtil;
import com.flow.demo.common.core.util.MyPageUtil;
import com.flow.demo.common.core.validator.UpdateGroup;
import com.flow.demo.common.online.dto.OnlineDatasourceDto;
import com.flow.demo.common.online.dto.OnlinePageDatasourceDto;
import com.flow.demo.common.online.dto.OnlinePageDto;
import com.flow.demo.common.online.model.OnlineDatasource;
import com.flow.demo.common.online.model.OnlinePage;
import com.flow.demo.common.online.model.OnlinePageDatasource;
import com.flow.demo.common.online.model.constant.PageStatus;
import com.flow.demo.common.online.service.OnlineDatasourceService;
import com.flow.demo.common.online.service.OnlineFormService;
import com.flow.demo.common.online.service.OnlinePageService;
import com.flow.demo.common.online.vo.OnlineDatasourceVo;
import com.flow.demo.common.online.vo.OnlinePageDatasourceVo;
import com.flow.demo.common.online.vo.OnlinePageVo;
import com.orangeforms.common.core.annotation.MyRequestBody;
import com.orangeforms.common.core.constant.ErrorCodeEnum;
import com.orangeforms.common.core.object.*;
import com.orangeforms.common.core.util.MyCommonUtil;
import com.orangeforms.common.core.util.MyModelUtil;
import com.orangeforms.common.core.util.MyPageUtil;
import com.orangeforms.common.core.validator.UpdateGroup;
import com.orangeforms.common.online.dto.OnlineDatasourceDto;
import com.orangeforms.common.online.dto.OnlinePageDatasourceDto;
import com.orangeforms.common.online.dto.OnlinePageDto;
import com.orangeforms.common.online.model.OnlineDatasource;
import com.orangeforms.common.online.model.OnlinePage;
import com.orangeforms.common.online.model.OnlinePageDatasource;
import com.orangeforms.common.online.model.constant.PageStatus;
import com.orangeforms.common.online.service.OnlineDatasourceService;
import com.orangeforms.common.online.service.OnlineFormService;
import com.orangeforms.common.online.service.OnlinePageService;
import com.orangeforms.common.online.vo.OnlineDatasourceVo;
import com.orangeforms.common.online.vo.OnlinePageDatasourceVo;
import com.orangeforms.common.online.vo.OnlinePageVo;
import com.github.pagehelper.page.PageMethod;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;

View File

@@ -1,16 +1,16 @@
package com.flow.demo.common.online.api.controller;
package com.orangeforms.common.online.api.controller;
import com.flow.demo.common.core.annotation.MyRequestBody;
import com.flow.demo.common.core.constant.ErrorCodeEnum;
import com.flow.demo.common.core.object.*;
import com.flow.demo.common.core.util.MyCommonUtil;
import com.flow.demo.common.core.util.MyModelUtil;
import com.flow.demo.common.core.util.MyPageUtil;
import com.flow.demo.common.core.validator.UpdateGroup;
import com.flow.demo.common.online.dto.OnlineRuleDto;
import com.flow.demo.common.online.model.OnlineRule;
import com.flow.demo.common.online.service.OnlineRuleService;
import com.flow.demo.common.online.vo.OnlineRuleVo;
import com.orangeforms.common.core.annotation.MyRequestBody;
import com.orangeforms.common.core.constant.ErrorCodeEnum;
import com.orangeforms.common.core.object.*;
import com.orangeforms.common.core.util.MyCommonUtil;
import com.orangeforms.common.core.util.MyModelUtil;
import com.orangeforms.common.core.util.MyPageUtil;
import com.orangeforms.common.core.validator.UpdateGroup;
import com.orangeforms.common.online.dto.OnlineRuleDto;
import com.orangeforms.common.online.model.OnlineRule;
import com.orangeforms.common.online.service.OnlineRuleService;
import com.orangeforms.common.online.vo.OnlineRuleVo;
import com.github.pagehelper.page.PageMethod;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;

View File

@@ -1,17 +1,17 @@
package com.flow.demo.common.online.api.controller;
package com.orangeforms.common.online.api.controller;
import cn.jimmyshi.beanquery.BeanQuery;
import com.flow.demo.common.core.annotation.MyRequestBody;
import com.flow.demo.common.core.constant.ErrorCodeEnum;
import com.flow.demo.common.core.object.*;
import com.flow.demo.common.core.util.MyCommonUtil;
import com.flow.demo.common.core.util.MyModelUtil;
import com.flow.demo.common.core.util.MyPageUtil;
import com.flow.demo.common.core.validator.UpdateGroup;
import com.flow.demo.common.online.dto.OnlineTableDto;
import com.flow.demo.common.online.model.OnlineTable;
import com.flow.demo.common.online.service.OnlineTableService;
import com.flow.demo.common.online.vo.OnlineTableVo;
import com.orangeforms.common.core.annotation.MyRequestBody;
import com.orangeforms.common.core.constant.ErrorCodeEnum;
import com.orangeforms.common.core.object.*;
import com.orangeforms.common.core.util.MyCommonUtil;
import com.orangeforms.common.core.util.MyModelUtil;
import com.orangeforms.common.core.util.MyPageUtil;
import com.orangeforms.common.core.validator.UpdateGroup;
import com.orangeforms.common.online.dto.OnlineTableDto;
import com.orangeforms.common.online.model.OnlineTable;
import com.orangeforms.common.online.service.OnlineTableService;
import com.orangeforms.common.online.vo.OnlineTableVo;
import com.github.pagehelper.page.PageMethod;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;

View File

@@ -1,16 +1,16 @@
package com.flow.demo.common.online.api.controller;
package com.orangeforms.common.online.api.controller;
import com.github.pagehelper.page.PageMethod;
import com.flow.demo.common.core.object.*;
import com.flow.demo.common.core.util.*;
import com.flow.demo.common.core.constant.*;
import com.flow.demo.common.core.annotation.MyRequestBody;
import com.flow.demo.common.core.validator.UpdateGroup;
import com.flow.demo.common.online.dto.OnlineVirtualColumnDto;
import com.flow.demo.common.online.model.OnlineVirtualColumn;
import com.flow.demo.common.online.model.constant.VirtualType;
import com.flow.demo.common.online.service.OnlineVirtualColumnService;
import com.flow.demo.common.online.vo.OnlineVirtualColumnVo;
import com.orangeforms.common.core.object.*;
import com.orangeforms.common.core.util.*;
import com.orangeforms.common.core.constant.*;
import com.orangeforms.common.core.annotation.MyRequestBody;
import com.orangeforms.common.core.validator.UpdateGroup;
import com.orangeforms.common.online.dto.OnlineVirtualColumnDto;
import com.orangeforms.common.online.model.OnlineVirtualColumn;
import com.orangeforms.common.online.model.constant.VirtualType;
import com.orangeforms.common.online.service.OnlineVirtualColumnService;
import com.orangeforms.common.online.vo.OnlineVirtualColumnVo;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

View File

@@ -1,2 +1,2 @@
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
com.flow.demo.common.online.api.config.OnlineApiAutoConfig
com.orangeforms.common.online.api.config.OnlineApiAutoConfig