tofly-parent应用调整

common-annotation/pom.xml

@@ -11,5 +11,6 @@
 
     <artifactId>common-annotation</artifactId>
 
-
+    <packaging>jar</packaging>
+    <version>1.0.0</version>
 </project>

common-baseapi/pom.xml

@@ -10,6 +10,18 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>common-baseapi</artifactId>
+    <packaging>jar</packaging>
+    <version>1.0.0</version>
+    <dependencies>
+        <dependency>
+            <groupId>com.tofly</groupId>
+            <artifactId>common-orm-mybatisplus</artifactId>
+            <version>1.0.0</version>
+        </dependency>
 
-
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger2</artifactId>
+        </dependency>
+    </dependencies>
 </project>

common-core/src/main/java/com/tofly/common/core/configs/DocBean.java

@@ -1,4 +1,4 @@
-package com.tofly.common.core.configs;
+package com.tofly.baseapi.config;
 
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;

common-oauth/src/main/java/com/tofly/common/oauth/config/SwaggerConfig.java

@@ -1,6 +1,5 @@
-package com.tofly.common.oauth.config;
+package com.tofly.baseapi.config;
 
-import com.tofly.common.core.configs.DocBean;
 import com.tofly.common.core.util.StringUtil;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;

common-oauth/src/main/java/com/tofly/common/entity/CommonCode.java

@@ -1,4 +1,4 @@
-package com.tofly.common.entity;
+package com.tofly.baseapi.entity;
 
 import lombok.Data;
 

common-oauth/src/main/resources/mapper/ToflyCodeCommonMapper.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.tofly.common.mapper.ToflyCodeCommonMapper">
+<mapper namespace="com.tofly.baseapi.mapper.ToflyCodeCommonMapper">
 
-    <resultMap id="commonCodeMap" type="com.tofly.common.entity.CommonCode">
+    <resultMap id="commonCodeMap" type="com.tofly.baseapi.entity.CommonCode">
         <result property="key" column="KEY"/>
         <result property="notes" column="NOTES"/>
     </resultMap>

common-core/pom.xml

@@ -26,11 +26,11 @@
             <version>${poi.version}</version>
         </dependency>
         <!--mybatis plus extension,包含了mybatis plus core-->
-        <dependency>
-            <groupId>com.baomidou</groupId>
-            <artifactId>mybatis-plus-extension</artifactId>
-            <version>3.1.2</version>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>com.baomidou</groupId>-->
+            <!--<artifactId>mybatis-plus-extension</artifactId>-->
+            <!--<version>3.1.2</version>-->
+        <!--</dependency>-->
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>

common-core/src/main/java/com/tofly/common/core/configs/MyStringArgumentResolver.java

@@ -1,41 +0,0 @@
-package com.tofly.common.core.configs;
-
-import org.apache.commons.lang.StringUtils;
-import org.springframework.core.MethodParameter;
-import org.springframework.web.bind.annotation.ValueConstants;
-import org.springframework.web.context.request.NativeWebRequest;
-import org.springframework.web.method.annotation.AbstractNamedValueMethodArgumentResolver;
-
-/**
- * @author tuonbed
- * @date 2019/10/30  9:55
- */
-public class MyStringArgumentResolver extends AbstractNamedValueMethodArgumentResolver {
-    @Override
-    protected NamedValueInfo createNamedValueInfo(MethodParameter methodParameter) {
-        return  new NamedValueInfo("", false, ValueConstants.DEFAULT_NONE);
-    }
-
-    @Override
-    protected Object resolveName(String s, MethodParameter methodParameter, NativeWebRequest nativeWebRequest) throws Exception {
-        String[] param = nativeWebRequest.getParameterValues(s);
-        if(param==null){
-            return null;
-        }
-
-
-
-        if(StringUtils.isEmpty(param[0])){
-            return null;
-        }
-
-
-        return param[0];
-    }
-
-    @Override
-    public boolean supportsParameter(MethodParameter methodParameter) {
-
-        return methodParameter.getParameterType().equals(Object.class);
-    }
-}

common-core/src/main/java/com/tofly/common/core/configs/ToflyConfig.java

@@ -1,76 +0,0 @@
-package com.tofly.common.core.configs;
-
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.stereotype.Component;
-
-/**
- * 读取项目相关配置
- * 
- * @author Administrator
- */
-@Component
-@ConfigurationProperties(prefix = "tofly")
-public class ToflyConfig {
-	/** 项目名称 */
-	private String name;
-	/** 版本 */
-	private String version;
-	/** 版权年份 */
-	private String copyrightYear;
-	/** 上传路径 */
-	private static String profile;
-	/** 获取地址开关 */
-	private static boolean addressEnabled;
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public String getVersion() {
-		return version;
-	}
-
-	public void setVersion(String version) {
-		this.version = version;
-	}
-
-	public String getCopyrightYear() {
-		return copyrightYear;
-	}
-
-	public void setCopyrightYear(String copyrightYear) {
-		this.copyrightYear = copyrightYear;
-	}
-
-	public static String getProfile() {
-		return profile;
-	}
-
-	public void setProfile(String profile) {
-		ToflyConfig.profile = profile;
-	}
-
-	public static boolean isAddressEnabled() {
-		return addressEnabled;
-	}
-
-	public void setAddressEnabled(boolean addressEnabled) {
-		ToflyConfig.addressEnabled = addressEnabled;
-	}
-
-	public static String getAvatarPath() {
-		return profile + "avatar/";
-	}
-
-	public static String getDownloadPath() {
-		return profile + "download/";
-	}
-
-	public static String getUploadPath() {
-		return profile + "upload/";
-	}
-}

common-core/src/main/java/com/tofly/common/core/configs/ToflyEntity.java

@@ -1,24 +0,0 @@
-package com.tofly.common.core.configs;
-
-import com.baomidou.mybatisplus.annotation.KeySequence;
-import com.baomidou.mybatisplus.annotation.TableName;
-import org.springframework.core.annotation.AliasFor;
-
-import java.lang.annotation.*;
-
-/**
- * @author Administrator
- * @date 2019/10/10  13:25
- */
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
-@Documented
-@Inherited
-@TableName
-@KeySequence
-public @interface ToflyEntity {
-
-    @AliasFor(annotation = TableName.class, attribute = "value")
-    String value() default "";
-
-}

common-core/src/main/java/com/tofly/common/core/constant/OracleCondition.java

@@ -1,13 +0,0 @@
-package com.tofly.common.core.constant;
-
-/**
- * @author tuonbed
- * @date 2019/10/30  10:27
- */
-public class OracleCondition {
-    public static final String EQUAL = "%s=#{%s}";
-    public static final String NOT_EQUAL = "%s<>#{%s}";
-    public static final String LIKE = "%s LIKE '%%'||#{%s}||'%%'";
-    public static final String LIKE_LEFT = "%s LIKE '%%'||#{%s}";
-    public static final String LIKE_RIGHT = "%s LIKE #{%s}||'%%'";
-}

common-ftp/pom.xml

@@ -10,12 +10,27 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>common-ftp</artifactId>
+    <packaging>jar</packaging>
+    <version>1.0.0</version>
+
+    <properties>
+        <thumbnailator.version>0.4.2</thumbnailator.version>
+    </properties>
+
 
     <dependencies>
         <dependency>
             <groupId>com.tofly</groupId>
             <artifactId>common-core</artifactId>
             <version>1.0.0</version>
+            <scope>provided</scope>
+        </dependency>
+
+
+        <dependency>
+            <groupId>net.coobird</groupId>
+            <artifactId>thumbnailator</artifactId>
+            <version>${thumbnailator.version}</version>
         </dependency>
     </dependencies>
 </project>

common-log/pom.xml

@@ -14,9 +14,22 @@
     <version>1.0.0</version>
 
     <dependencies>
+        <!--<dependency>-->
+            <!--<groupId>com.tofly</groupId>-->
+            <!--<artifactId>base-api</artifactId>-->
+            <!--<version>1.0.0</version>-->
+        <!--</dependency>-->
+
+        <dependency>
+            <groupId>com.tofly</groupId>
+            <artifactId>common-oauth</artifactId>
+            <version>1.0.0</version>
+            <scope>provided</scope>
+        </dependency>
+
         <dependency>
             <groupId>com.tofly</groupId>
-            <artifactId>base-api</artifactId>
+            <artifactId>common-entity</artifactId>
             <version>1.0.0</version>
         </dependency>
 

common-log/src/main/java/com/tofly/common/log/event/SysLogEvent.java

@@ -1,6 +1,6 @@
 package com.tofly.common.log.event;
 
-import com.tofly.base.api.entity.Log;
+import com.tofly.entity.pojo.Log;
 import org.springframework.context.ApplicationEvent;
 
 /**

common-log/src/main/java/com/tofly/common/log/event/SysLogListener.java

@@ -1,8 +1,8 @@
 package com.tofly.common.log.event;
 
-import com.tofly.base.api.entity.Log;
-import com.tofly.base.api.feign.BaseLogService;
 import com.tofly.common.core.constant.SecurityConstants;
+import com.tofly.common.log.service.BaseLogService;
+import com.tofly.entity.pojo.Log;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.event.EventListener;
@@ -19,7 +19,7 @@ import org.springframework.scheduling.annotation.Async;
 public class SysLogListener {
 
 
-	private  BaseLogService baseLogService;
+	private BaseLogService baseLogService;
 	private Environment environment;
 
 	@Async

base-api/src/main/java/com/tofly/base/api/feign/BaseLogService.java

@@ -1,9 +1,8 @@
-package com.tofly.base.api.feign;
+package com.tofly.common.log.service;
 
-import com.tofly.base.api.entity.Log;
-import com.tofly.base.api.feign.factory.BaseLogServiceFallbackFactory;
 import com.tofly.common.core.constant.SecurityConstants;
 import com.tofly.common.core.entity.ResultRespone;
+import com.tofly.entity.pojo.Log;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -13,9 +12,10 @@ import org.springframework.web.bind.annotation.RequestHeader;
  * @author Administrator
  * @date 2019/9/3  14:54
  */
-@FeignClient( contextId = "baseLogService",value = "tofly-base",fallbackFactory = BaseLogServiceFallbackFactory.class)
+@FeignClient( contextId = "baseLogService",value = "#{toflylog.serviceName}",fallbackFactory = BaseLogServiceFallbackFactory.class)
 public interface BaseLogService {
 
-    @PostMapping("/log/add")
+//    @PostMapping("/log/add")
+    @PostMapping("#{toflylog.mothedName}")
     ResultRespone saveLog(@RequestBody Log log, @RequestHeader(SecurityConstants.FROM) String from);
 }

base-api/src/main/java/com/tofly/base/api/feign/factory/BaseLogServiceFallbackFactory.java

@@ -1,7 +1,5 @@
-package com.tofly.base.api.feign.factory;
+package com.tofly.common.log.service;
 
-import com.tofly.base.api.feign.BaseLogService;
-import com.tofly.base.api.feign.fallback.BaseLogServiceFallbackImpl;
 import feign.hystrix.FallbackFactory;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;

base-api/src/main/java/com/tofly/base/api/feign/fallback/BaseLogServiceFallbackImpl.java

@@ -1,8 +1,7 @@
-package com.tofly.base.api.feign.fallback;
+package com.tofly.common.log.service;
 
-import com.tofly.base.api.entity.Log;
-import com.tofly.base.api.feign.BaseLogService;
 import com.tofly.common.core.entity.ResultRespone;
+import com.tofly.entity.pojo.Log;
 import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;

common-mq-active/pom.xml

@@ -10,6 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>common-mq-active</artifactId>
-
+    <packaging>jar</packaging>
+    <version>1.0.0</version>
 
 </project>

common-oauth/pom.xml

@@ -26,35 +26,7 @@
             <version>1.0.0</version>
         </dependency>
 
-        <dependency>
-            <groupId>com.oracle</groupId>
-            <artifactId>ojdbc6</artifactId>
-            <version>11.2.0.4.0-atlassian-hosted</version>
-        </dependency>
-
-        <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-            <version>8.0.21</version>
-        </dependency>
-
-        <dependency>
-            <groupId>com.baomidou</groupId>
-            <artifactId>mybatis-plus-boot-starter</artifactId>
-            <version>3.1.2</version>
-        </dependency>
-
-        <!-- druid-->
-        <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>druid-spring-boot-starter</artifactId>
-            <version>${druid.version}</version>
-        </dependency>
 
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-data-redis</artifactId>
-        </dependency>
 
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -82,10 +54,7 @@
             <version>2.9.2</version>
             <scope>compile</scope>
         </dependency>
-        <dependency>
-            <groupId>io.springfox</groupId>
-            <artifactId>springfox-swagger2</artifactId>
-        </dependency>
+
     </dependencies>
 
 </project>

common-oauth/src/main/java/com/tofly/common/config/UploadAutoConfiguration.java

@@ -1,38 +1,38 @@
-package com.tofly.common.config;
-
-import com.tofly.base.api.feign.FlowableService;
-import com.tofly.common.oauth.handler.AutoUploadForm;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-import javax.annotation.Resource;
-
-/**
- * @author tuonbed
- * @date 2020/5/29  10:06
- */
-@Configuration
-@ConditionalOnClass(AutoUploadForm.class)
-@EnableConfigurationProperties(UploadAutoProperties.class)
-public class UploadAutoConfiguration {
-
-    @Resource
-    private UploadAutoProperties uploadAutoProperties;
-    @Resource
-    private FlowableService flowableService;
-
-
-    @Bean
-    @ConditionalOnMissingBean(AutoUploadForm.class)
-    @ConditionalOnProperty(prefix = "tofly.flupload",value = "enable",havingValue = "true")
-    public AutoUploadForm autoUploadForm(){
-        AutoUploadForm autoUploadForm=new AutoUploadForm();
-        autoUploadForm.setAppName(uploadAutoProperties.getAppName());
-        autoUploadForm.setFlowableService(flowableService);
-        return autoUploadForm;
-    }
-}
+//package com.tofly.common.config;
+//
+//import com.tofly.base.api.feign.FlowableService;
+//import com.tofly.common.oauth.handler.AutoUploadForm;
+//import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+//import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+//import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+//import org.springframework.boot.context.properties.EnableConfigurationProperties;
+//import org.springframework.context.annotation.Bean;
+//import org.springframework.context.annotation.Configuration;
+//
+//import javax.annotation.Resource;
+//
+///**
+// * @author tuonbed
+// * @date 2020/5/29  10:06
+// */
+//@Configuration
+//@ConditionalOnClass(AutoUploadForm.class)
+//@EnableConfigurationProperties(UploadAutoProperties.class)
+//public class UploadAutoConfiguration {
+//
+//    @Resource
+//    private UploadAutoProperties uploadAutoProperties;
+//    @Resource
+//    private FlowableService flowableService;
+//
+//
+//    @Bean
+//    @ConditionalOnMissingBean(AutoUploadForm.class)
+//    @ConditionalOnProperty(prefix = "tofly.flupload",value = "enable",havingValue = "true")
+//    public AutoUploadForm autoUploadForm(){
+//        AutoUploadForm autoUploadForm=new AutoUploadForm();
+//        autoUploadForm.setAppName(uploadAutoProperties.getAppName());
+//        autoUploadForm.setFlowableService(flowableService);
+//        return autoUploadForm;
+//    }
+//}

common-oauth/src/main/java/com/tofly/common/config/UploadAutoProperties.java

@@ -1,15 +1,15 @@
-package com.tofly.common.config;
-
-import lombok.Data;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-
-/**
- * @author tuonbed
- * @date 2020/5/29  10:08
- */
-@ConfigurationProperties(prefix = "tofly.flupload")
-@Data
-public class UploadAutoProperties {
-    private String appName;
-    private String time;
-}
+//package com.tofly.common.config;
+//
+//import lombok.Data;
+//import org.springframework.boot.context.properties.ConfigurationProperties;
+//
+///**
+// * @author tuonbed
+// * @date 2020/5/29  10:08
+// */
+//@ConfigurationProperties(prefix = "tofly.flupload")
+//@Data
+//public class UploadAutoProperties {
+//    private String appName;
+//    private String time;
+//}

common-oauth/src/main/java/com/tofly/common/mapper/ToflyCodeCommonMapper.java

@@ -1,21 +0,0 @@
-/*
- * Author: wangjian
- * 生成mapper
- */
-package com.tofly.common.mapper;
-
-import com.tofly.common.entity.CommonCode;
-
-import java.util.List;
-
-/**
- * 公共mapper
- *
- * @author admin
- * @date Thu Oct 10 00:00:00 CST 2019
- */
-public interface ToflyCodeCommonMapper {
-    List<CommonCode> getListCode(String value);
-    String getUserName(Long id);
-    String getUserAvatar(Long id);
-}

common-oauth/src/main/java/com/tofly/common/oauth/exception/CommonControllerExceptionAdvice.java

@@ -15,40 +15,40 @@ import java.lang.reflect.UndeclaredThrowableException;
  * @author Administrator
  * @date 2019/10/17  14:16
  */
-@ResponseBody
-@ControllerAdvice
-@Slf4j
-public class CommonControllerExceptionAdvice {
-    @ExceptionHandler(value = Exception.class)
-    public ResultRespone errorHandle(Exception e){
-        String ret="";
-        if(StringUtil.isEmpty(e.getMessage())){
-            if(e instanceof UndeclaredThrowableException){
-                Throwable undeclaredThrowable = ((UndeclaredThrowableException) e).getUndeclaredThrowable();
-                if(undeclaredThrowable instanceof Exception){
-                    ret = ((Exception)undeclaredThrowable).getLocalizedMessage();
-                }
-            }
-
-            if(StringUtil.isEmpty(ret)){
-                ByteArrayOutputStream out = new ByteArrayOutputStream();
-                PrintStream pout = new PrintStream(out);
-                e.printStackTrace(pout);
-                ret = new String(out.toByteArray());
-                pout.close();
-                try {
-                    out.close();
-                } catch (Exception ee) {
-                }
-            }
-        }else {
-            ret=e.getMessage();
-        }
-        if("No AuthenticationProvider found for org.springframework.security.authentication.UsernamePasswordAuthenticationToken"
-        .equals(ret)){
-            return ResultRespone.failed("密码输入错误");
-        }else {
-            return ResultRespone.failed(ret);
-        }
-    }
-}
+//@ResponseBody
+//@ControllerAdvice
+//@Slf4j
+//public class CommonControllerExceptionAdvice {
+//    @ExceptionHandler(value = Exception.class)
+//    public ResultRespone errorHandle(Exception e){
+//        String ret="";
+//        if(StringUtil.isEmpty(e.getMessage())){
+//            if(e instanceof UndeclaredThrowableException){
+//                Throwable undeclaredThrowable = ((UndeclaredThrowableException) e).getUndeclaredThrowable();
+//                if(undeclaredThrowable instanceof Exception){
+//                    ret = ((Exception)undeclaredThrowable).getLocalizedMessage();
+//                }
+//            }
+//
+//            if(StringUtil.isEmpty(ret)){
+//                ByteArrayOutputStream out = new ByteArrayOutputStream();
+//                PrintStream pout = new PrintStream(out);
+//                e.printStackTrace(pout);
+//                ret = new String(out.toByteArray());
+//                pout.close();
+//                try {
+//                    out.close();
+//                } catch (Exception ee) {
+//                }
+//            }
+//        }else {
+//            ret=e.getMessage();
+//        }
+//        if("No AuthenticationProvider found for org.springframework.security.authentication.UsernamePasswordAuthenticationToken"
+//        .equals(ret)){
+//            return ResultRespone.failed("密码输入错误");
+//        }else {
+//            return ResultRespone.failed(ret);
+//        }
+//    }
+//}

common-oauth/src/main/java/com/tofly/common/oauth/handler/AutoUploadForm.java

@@ -1,199 +1,199 @@
-package com.tofly.common.oauth.handler;
-
-import com.tofly.base.api.feign.FlowableService;
-import com.tofly.common.core.constant.SecurityConstants;
-import com.tofly.common.core.entity.ResultRespone;
-import com.tofly.common.core.util.Date8Util;
-import com.tofly.common.core.util.StringUtil;
-import com.tofly.common.oauth.util.ToflyDataTypeConstant;
-import lombok.SneakyThrows;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.jdbc.core.PreparedStatementSetter;
-import org.springframework.scheduling.annotation.Async;
-import org.springframework.scheduling.annotation.EnableAsync;
-import org.springframework.scheduling.annotation.EnableScheduling;
-import org.springframework.scheduling.annotation.Scheduled;
-
-import java.sql.PreparedStatement;
-import java.sql.SQLException;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-/**
- * 〈一句话功能简述〉<br>
- * 〈定时自动同步流程数据到业务数据〉开启异步多线程方式
- *
- * @author wj
- * @create 2020/2/5 9:20
- * @since 1.0.0
- */
-//@Component
-@EnableScheduling   // 1.开启定时任务
-@EnableAsync        // 2.开启多线程
-@Slf4j
-public class AutoUploadForm{
-
-    //@Autowired
-    private FlowableService flowableService;
-
-    private String appName;
-
-    public void setAppName(String appName){
-        this.appName=appName;
-    }
-
-    public void setFlowableService(FlowableService flowableService){
-        this.flowableService=flowableService;
-    }
-
-    @Autowired
-    private ToflyDataTypeConstant toflyDataTypeConstant;
-
-
-    @Autowired
-    private JdbcTemplate jdbcTemplate;
-
-    private String SELECTUPLOADFORM_SQL="select * from table where proc_id=?";
-
-    private String NOWTIME_SQL="nowtime";
-
-    private  String  INSERTFORM_SQL="INSERT INTO table(proc_id,create_time,cols) values(?,"+NOWTIME_SQL+",thisvalues)";
-    private String UPLOADFORM_SQL="update table set cols2 where proc_id=?";
-
-    @Async
-    @Scheduled(cron = "${tofly.flupload.time}")  //间隔5秒
-    // @Scheduled(fixedDelay = 5000)  //间隔5秒
-    @SneakyThrows
-    public void uploadForm(){
-
-        System.out.println(Date8Util.getCurrentDate().toString()+ Thread.currentThread()+"-----------------来了：appform:"+appName+",,,appName:"+appName);
-
-        if(StringUtil.isEmpty(appName)){
-            log.error("未获取到appName，不执行同步操作");
-            return;
-        }
-        ResultRespone resultRespone;
-        try {
-            resultRespone=flowableService.uploadForm(appName, SecurityConstants.FROM_IN);
-        }catch (Exception e){
-            log.error("表单同步业务远程调用失败："+e.getMessage());
-            return;
-        }
-        INSERTFORM_SQL=INSERTFORM_SQL.replace(NOWTIME_SQL,toflyDataTypeConstant.getNowTimeSql());
-
-        if(resultRespone.getCode()!=-1){
-            List<Map> list=(List<Map>)resultRespone.getResult();
-            SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
-            SimpleDateFormat sdf2=new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
-            if(list!=null && list.size()>0){
-                list.forEach(m->{
-                    final Map<String, Object> mycollect = ((List<Map>) m.get("data")).stream()
-                            .filter(k->StringUtil.isNotEmpty((String)k.get("text")))
-                            .collect(Collectors.toMap(k ->(String)k.get("name"), v ->
-                            {
-                                String type=(String)v.get("vtype");
-                                Object reO=null;
-                                switch (type){
-                                    case "string":
-                                        reO=(String)v.get("text");
-                                        break;
-                                    case "int":
-                                        reO=(Integer)v.get("text");
-                                        break;
-                                    case "date":
-                                        String value=(String)v.get("text");
-                                        java.util.Date d = null;
-                                        try {
-                                            d=sdf.parse(value);
-                                        }catch (ParseException s){
-                                            log.error("格式化日期出错：{},{}",value,s);
-                                        }
-                                        reO=new java.sql.Date(d.getTime());
-                                        break;
-                                    case "time":
-                                        String vt=(String)v.get("text");
-                                        java.util.Date d2 = null;
-                                        try {
-                                            d2 = sdf2.parse(vt);
-                                        }catch (ParseException s){
-                                            log.error("格式化日期出错：{},{}",vt,s);
-                                        }
-                                        reO=new java.sql.Time(d2.getTime());
-                                        break;
-                                    default:
-                                        reO=v.get("text");
-                                }
-                                return reO;
-                            }
-                            ));
-                    String seSql= SELECTUPLOADFORM_SQL.replace("table",(String) m.get("FROM_APPTABLE"));
-
-                    List maps = jdbcTemplate.queryForList(seSql, (String) m.get("PROC_ID"));
-                    String exeSql;
-                    if(maps==null || maps.size()==0){
-                        StringBuilder sb=new StringBuilder(),sbValue=new StringBuilder();
-                        mycollect.forEach((k,v)->{sb.append(k).append(",");sbValue.append("?").append(",");});
-                        String relace=sb.substring(0,sb.lastIndexOf(","));
-                        exeSql=INSERTFORM_SQL.replace("table",(String) m.get("FROM_APPTABLE"));
-                        exeSql=exeSql.replace("cols",relace);
-                        exeSql=exeSql.replace("thisvalues",sbValue.substring(0,sbValue.lastIndexOf(",")));
-                        jdbcTemplate.update(exeSql, new PreparedStatementSetter() {
-                            @Override
-                            public void setValues(PreparedStatement preparedStatement) throws SQLException {
-                                preparedStatement.setString(1,(String) m.get("PROC_ID"));
-                                int i=2;
-                                for(Map.Entry<String, Object> it : mycollect.entrySet()){
-                                    try {
-                                        preparedStatement.setObject(i,it.getValue());
-                                    }catch (SQLException s){
-                                        log.error("传参错误");
-                                    }
-                                    i++;
-                                }
-
-//                                mycollect.forEach((k,v)->{
+//package com.tofly.common.oauth.handler;
+//
+//import com.tofly.base.api.feign.FlowableService;
+//import com.tofly.common.core.constant.SecurityConstants;
+//import com.tofly.common.core.entity.ResultRespone;
+//import com.tofly.common.core.util.Date8Util;
+//import com.tofly.common.core.util.StringUtil;
+//import com.tofly.common.oauth.util.ToflyDataTypeConstant;
+//import lombok.SneakyThrows;
+//import lombok.extern.slf4j.Slf4j;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.jdbc.core.JdbcTemplate;
+//import org.springframework.jdbc.core.PreparedStatementSetter;
+//import org.springframework.scheduling.annotation.Async;
+//import org.springframework.scheduling.annotation.EnableAsync;
+//import org.springframework.scheduling.annotation.EnableScheduling;
+//import org.springframework.scheduling.annotation.Scheduled;
+//
+//import java.sql.PreparedStatement;
+//import java.sql.SQLException;
+//import java.text.ParseException;
+//import java.text.SimpleDateFormat;
+//import java.util.List;
+//import java.util.Map;
+//import java.util.stream.Collectors;
+//
+///**
+// * 〈一句话功能简述〉<br>
+// * 〈定时自动同步流程数据到业务数据〉开启异步多线程方式
+// *
+// * @author wj
+// * @create 2020/2/5 9:20
+// * @since 1.0.0
+// */
+////@Component
+//@EnableScheduling   // 1.开启定时任务
+//@EnableAsync        // 2.开启多线程
+//@Slf4j
+//public class AutoUploadForm{
+//
+//    //@Autowired
+//    private FlowableService flowableService;
+//
+//    private String appName;
+//
+//    public void setAppName(String appName){
+//        this.appName=appName;
+//    }
+//
+//    public void setFlowableService(FlowableService flowableService){
+//        this.flowableService=flowableService;
+//    }
+//
+//    @Autowired
+//    private ToflyDataTypeConstant toflyDataTypeConstant;
+//
+//
+//    @Autowired
+//    private JdbcTemplate jdbcTemplate;
+//
+//    private String SELECTUPLOADFORM_SQL="select * from table where proc_id=?";
+//
+//    private String NOWTIME_SQL="nowtime";
+//
+//    private  String  INSERTFORM_SQL="INSERT INTO table(proc_id,create_time,cols) values(?,"+NOWTIME_SQL+",thisvalues)";
+//    private String UPLOADFORM_SQL="update table set cols2 where proc_id=?";
+//
+//    @Async
+//    @Scheduled(cron = "${tofly.flupload.time}")  //间隔5秒
+//    // @Scheduled(fixedDelay = 5000)  //间隔5秒
+//    @SneakyThrows
+//    public void uploadForm(){
+//
+//        System.out.println(Date8Util.getCurrentDate().toString()+ Thread.currentThread()+"-----------------来了：appform:"+appName+",,,appName:"+appName);
+//
+//        if(StringUtil.isEmpty(appName)){
+//            log.error("未获取到appName，不执行同步操作");
+//            return;
+//        }
+//        ResultRespone resultRespone;
+//        try {
+//            resultRespone=flowableService.uploadForm(appName, SecurityConstants.FROM_IN);
+//        }catch (Exception e){
+//            log.error("表单同步业务远程调用失败："+e.getMessage());
+//            return;
+//        }
+//        INSERTFORM_SQL=INSERTFORM_SQL.replace(NOWTIME_SQL,toflyDataTypeConstant.getNowTimeSql());
+//
+//        if(resultRespone.getCode()!=-1){
+//            List<Map> list=(List<Map>)resultRespone.getResult();
+//            SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
+//            SimpleDateFormat sdf2=new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
+//            if(list!=null && list.size()>0){
+//                list.forEach(m->{
+//                    final Map<String, Object> mycollect = ((List<Map>) m.get("data")).stream()
+//                            .filter(k->StringUtil.isNotEmpty((String)k.get("text")))
+//                            .collect(Collectors.toMap(k ->(String)k.get("name"), v ->
+//                            {
+//                                String type=(String)v.get("vtype");
+//                                Object reO=null;
+//                                switch (type){
+//                                    case "string":
+//                                        reO=(String)v.get("text");
+//                                        break;
+//                                    case "int":
+//                                        reO=(Integer)v.get("text");
+//                                        break;
+//                                    case "date":
+//                                        String value=(String)v.get("text");
+//                                        java.util.Date d = null;
+//                                        try {
+//                                            d=sdf.parse(value);
+//                                        }catch (ParseException s){
+//                                            log.error("格式化日期出错：{},{}",value,s);
+//                                        }
+//                                        reO=new java.sql.Date(d.getTime());
+//                                        break;
+//                                    case "time":
+//                                        String vt=(String)v.get("text");
+//                                        java.util.Date d2 = null;
+//                                        try {
+//                                            d2 = sdf2.parse(vt);
+//                                        }catch (ParseException s){
+//                                            log.error("格式化日期出错：{},{}",vt,s);
+//                                        }
+//                                        reO=new java.sql.Time(d2.getTime());
+//                                        break;
+//                                    default:
+//                                        reO=v.get("text");
+//                                }
+//                                return reO;
+//                            }
+//                            ));
+//                    String seSql= SELECTUPLOADFORM_SQL.replace("table",(String) m.get("FROM_APPTABLE"));
+//
+//                    List maps = jdbcTemplate.queryForList(seSql, (String) m.get("PROC_ID"));
+//                    String exeSql;
+//                    if(maps==null || maps.size()==0){
+//                        StringBuilder sb=new StringBuilder(),sbValue=new StringBuilder();
+//                        mycollect.forEach((k,v)->{sb.append(k).append(",");sbValue.append("?").append(",");});
+//                        String relace=sb.substring(0,sb.lastIndexOf(","));
+//                        exeSql=INSERTFORM_SQL.replace("table",(String) m.get("FROM_APPTABLE"));
+//                        exeSql=exeSql.replace("cols",relace);
+//                        exeSql=exeSql.replace("thisvalues",sbValue.substring(0,sbValue.lastIndexOf(",")));
+//                        jdbcTemplate.update(exeSql, new PreparedStatementSetter() {
+//                            @Override
+//                            public void setValues(PreparedStatement preparedStatement) throws SQLException {
+//                                preparedStatement.setString(1,(String) m.get("PROC_ID"));
+//                                int i=2;
+//                                for(Map.Entry<String, Object> it : mycollect.entrySet()){
 //                                    try {
-//                                        preparedStatement.setString(i,k);
-//                                        preparedStatement.setObject(size+1+i,v);
+//                                        preparedStatement.setObject(i,it.getValue());
 //                                    }catch (SQLException s){
 //                                        log.error("传参错误");
 //                                    }
 //                                    i++;
-//                                });
-                            }
-                        });
-                    }else {
-                        StringBuilder sb=new StringBuilder();
-                        mycollect.forEach((k,v)->{sb.append(k).append("=?").append(",");});
-                        String relace=sb.substring(0,sb.lastIndexOf(","));
-                        exeSql=UPLOADFORM_SQL.replace("table",(String) m.get("FROM_APPTABLE"));
-                        exeSql=exeSql.replace("cols2",relace);
-                        jdbcTemplate.update(exeSql, new PreparedStatementSetter() {
-                            @Override
-                            public void setValues(PreparedStatement preparedStatement) throws SQLException {
-                                int i=1;
-                                int size=mycollect.size();
-                                for(Map.Entry<String, Object> it : mycollect.entrySet()){
-                                    try {
-                                        preparedStatement.setObject(i,it.getValue());
-                                    }catch (SQLException s){
-                                        log.error("传参错误");
-                                    }
-                                    i++;
-                                }
-                                preparedStatement.setString(i,(String) m.get("PROC_ID"));
-                            }
-                        });
-                    }
-                });
-            }
-        }else {
-            log.error("未获取到数据:",resultRespone.getMessage());
-        }
-    }
-}
+//                                }
+//
+////                                mycollect.forEach((k,v)->{
+////                                    try {
+////                                        preparedStatement.setString(i,k);
+////                                        preparedStatement.setObject(size+1+i,v);
+////                                    }catch (SQLException s){
+////                                        log.error("传参错误");
+////                                    }
+////                                    i++;
+////                                });
+//                            }
+//                        });
+//                    }else {
+//                        StringBuilder sb=new StringBuilder();
+//                        mycollect.forEach((k,v)->{sb.append(k).append("=?").append(",");});
+//                        String relace=sb.substring(0,sb.lastIndexOf(","));
+//                        exeSql=UPLOADFORM_SQL.replace("table",(String) m.get("FROM_APPTABLE"));
+//                        exeSql=exeSql.replace("cols2",relace);
+//                        jdbcTemplate.update(exeSql, new PreparedStatementSetter() {
+//                            @Override
+//                            public void setValues(PreparedStatement preparedStatement) throws SQLException {
+//                                int i=1;
+//                                int size=mycollect.size();
+//                                for(Map.Entry<String, Object> it : mycollect.entrySet()){
+//                                    try {
+//                                        preparedStatement.setObject(i,it.getValue());
+//                                    }catch (SQLException s){
+//                                        log.error("传参错误");
+//                                    }
+//                                    i++;
+//                                }
+//                                preparedStatement.setString(i,(String) m.get("PROC_ID"));
+//                            }
+//                        });
+//                    }
+//                });
+//            }
+//        }else {
+//            log.error("未获取到数据:",resultRespone.getMessage());
+//        }
+//    }
+//}

common-oauth/src/main/java/com/tofly/common/oauth/handler/EnableUploadForm.java

@@ -1,18 +1,18 @@
-package com.tofly.common.oauth.handler;
-
-import org.springframework.context.annotation.Import;
-
-import java.lang.annotation.*;
-
-/**
- * @author tuonbed
- * @date 2020/2/12  10:19
- * 启动工作流表单同步到业务功能
- */
-@Target({ElementType.TYPE})
-@Retention(RetentionPolicy.RUNTIME)
-@Documented
-@Inherited
-@Import({AutoUploadForm.class})
-public @interface EnableUploadForm {
-}
+//package com.tofly.common.oauth.handler;
+//
+//import org.springframework.context.annotation.Import;
+//
+//import java.lang.annotation.*;
+//
+///**
+// * @author tuonbed
+// * @date 2020/2/12  10:19
+// * 启动工作流表单同步到业务功能
+// */
+//@Target({ElementType.TYPE})
+//@Retention(RetentionPolicy.RUNTIME)
+//@Documented
+//@Inherited
+//@Import({AutoUploadForm.class})
+//public @interface EnableUploadForm {
+//}

common-orm-mybatisplus/pom.xml

@@ -10,6 +10,45 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>common-orm-mybatisplus</artifactId>
+    <packaging>jar</packaging>
+    <version>1.0.0</version>
 
+    <dependencies>
+        <dependency>
+            <groupId>com.tofly</groupId>
+            <artifactId>common-core</artifactId>
+            <version>1.0.0</version>
+        </dependency>
 
+        <dependency>
+            <groupId>com.tofly</groupId>
+            <artifactId>common-oauth</artifactId>
+            <version>1.0.0</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.oracle</groupId>
+            <artifactId>ojdbc6</artifactId>
+            <version>11.2.0.4.0-atlassian-hosted</version>
+        </dependency>
+
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+            <version>8.0.21</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-boot-starter</artifactId>
+            <version>3.1.2</version>
+        </dependency>
+
+        <!-- druid-->
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>druid-spring-boot-starter</artifactId>
+            <version>${druid.version}</version>
+        </dependency>
+    </dependencies>
 </project>

common-oauth/src/main/java/com/tofly/common/oauth/util/DataTypeUtil.java

@@ -1,4 +1,4 @@
-package com.tofly.common.oauth.util;
+package com.tofly.mybatisplus.config;
 
 import com.tofly.common.core.util.SpringContextHolder;
 import lombok.experimental.UtilityClass;

common-oauth/src/main/java/com/tofly/common/oauth/config/MapKeyLowerWrapper.java

@@ -1,12 +1,11 @@
-package com.tofly.common.oauth.config;
+package com.tofly.mybatisplus.config;
 
+import com.tofly.common.core.util.StringUtil;
 import org.apache.ibatis.reflection.MetaObject;
 import org.apache.ibatis.reflection.wrapper.MapWrapper;
 
 import java.util.Map;
 
-import static com.tofly.common.core.util.StringUtil.underlineToCamel;
-
 /**
  * @author Administrator
  * @date 2019/10/28  14:51
@@ -21,6 +20,6 @@ public class MapKeyLowerWrapper extends MapWrapper {
     public String findProperty(String name, boolean useCamelCaseMapping) {
 
         //改为驼峰形式
-        return underlineToCamel(name);
+        return StringUtil.underlineToCamel(name);
     }
 }

common-oauth/src/main/java/com/tofly/common/oauth/config/MapWrapperFactory.java

@@ -1,4 +1,4 @@
-package com.tofly.common.oauth.config;
+package com.tofly.mybatisplus.config;
 
 import org.apache.ibatis.reflection.MetaObject;
 import org.apache.ibatis.reflection.wrapper.ObjectWrapper;

common-oauth/src/main/java/com/tofly/common/oauth/handler/MybatisKeyGenerator.java

@@ -1,4 +1,4 @@
-package com.tofly.common.oauth.handler;
+package com.tofly.mybatisplus.config;
 
 import com.alibaba.druid.pool.DruidDataSource;
 import com.baomidou.mybatisplus.core.incrementer.IKeyGenerator;

common-oauth/src/main/java/com/tofly/common/oauth/config/MybatisPlusConfigurer.java

@@ -1,4 +1,4 @@
-package com.tofly.common.oauth.config;
+package com.tofly.mybatisplus.config;
 
 import com.baomidou.mybatisplus.autoconfigure.ConfigurationCustomizer;
 import com.baomidou.mybatisplus.core.MybatisConfiguration;
@@ -6,9 +6,6 @@ import com.baomidou.mybatisplus.core.config.GlobalConfig;
 import com.baomidou.mybatisplus.extension.parsers.DynamicTableNameParser;
 import com.baomidou.mybatisplus.extension.parsers.ITableNameHandler;
 import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
-import com.tofly.common.mapper.ToflyCodeCommonMapper;
-import com.tofly.common.oauth.handler.MybatisPlusHandler;
-import com.tofly.common.oauth.util.ToflyDataTypeConstant;
 import org.apache.ibatis.mapping.DatabaseIdProvider;
 import org.apache.ibatis.mapping.VendorDatabaseIdProvider;
 import org.apache.ibatis.reflection.MetaObject;

common-oauth/src/main/java/com/tofly/common/oauth/handler/MybatisPlusHandler.java

@@ -1,4 +1,4 @@
-package com.tofly.common.oauth.handler;
+package com.tofly.mybatisplus.config;
 
 import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
 import com.tofly.common.core.constant.CommonConstants;

common-oauth/src/main/java/com/tofly/common/oauth/util/ToflyDataTypeConstant.java

@@ -1,4 +1,4 @@
-package com.tofly.common.oauth.util;
+package com.tofly.mybatisplus.config;
 
 import com.alibaba.druid.pool.DruidDataSource;
 import org.springframework.beans.factory.annotation.Autowired;

common-oauth/src/main/java/com/tofly/common/config/RedisTemplateConfig.java

@@ -1,4 +1,4 @@
-package com.tofly.common.config;
+package com.tofly.redis.config;
 
 import lombok.AllArgsConstructor;
 import org.springframework.boot.autoconfigure.AutoConfigureBefore;

common-security/pom.xml

@@ -10,6 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>common-security</artifactId>
-
+    <packaging>jar</packaging>
+    <version>1.0.0</version>
 
 </project>

common-web/pom.xml

@@ -10,6 +10,14 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>common-web</artifactId>
-
-
+    <packaging>jar</packaging>
+    <version>1.0.0</version>
+    <dependencies>
+        <dependency>
+            <groupId>com.tofly</groupId>
+            <artifactId>common-core</artifactId>
+            <version>1.0.0</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
 </project>