songyh пре 3 година
родитељ
комит
70eb94aea7

+ 16 - 0
jeecg-boot-bytedance-ad/pom.xml

@@ -50,5 +50,21 @@
                 <artifactId>spring-boot-maven-plugin</artifactId>
             </plugin>
         </plugins>
+        <resources>
+            <!-- 解决MyBatis配置文件引入问题 -->
+            <resource>
+                <directory>src/main/java</directory>
+                <includes>
+                    <include>**/*.properties</include>
+                    <include>**/*.xml</include>
+                </includes>
+                <!-- 是否替换资源中的属性-->
+                <filtering>true</filtering>
+            </resource>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
     </build>
 </project>

+ 0 - 315
jeecg-boot-bytedance-ad/src/main/resources/application-test.yml

@@ -1,315 +0,0 @@
-server:
-  port: 7004
-  tomcat:
-    max-swallow-size: -1
-  error:
-    include-exception: true
-    include-stacktrace: ALWAYS
-    include-message: ALWAYS
-  servlet:
-    context-path: /jeecg-boot
-  compression:
-    enabled: true
-    min-response-size: 1024
-    mime-types: application/javascript,application/json,application/xml,text/html,text/xml,text/plain,text/css,image/*
-
-management:
-  endpoints:
-    web:
-      exposure:
-        include: metrics,httptrace
-
-spring:
-  servlet:
-    multipart:
-      max-file-size: 10MB
-      max-request-size: 10MB
-  mail:
-    host: smtp.163.com
-    username: jeecgos@163.com
-    password: ??
-    properties:
-      mail:
-        smtp:
-          auth: true
-          starttls:
-            enable: true
-            required: true
-  ## quartz定时任务,采用数据库方式
-  quartz:
-    job-store-type: jdbc
-    initialize-schema: embedded
-    #设置自动启动,默认为 true
-    auto-startup: true
-    #启动时更新己存在的Job
-    overwrite-existing-jobs: true
-    properties:
-      org:
-        quartz:
-          scheduler:
-            instanceName: MyScheduler
-            instanceId: AUTO
-          jobStore:
-            class: org.quartz.impl.jdbcjobstore.JobStoreTX
-            driverDelegateClass: org.quartz.impl.jdbcjobstore.StdJDBCDelegate
-            tablePrefix: QRTZ_
-            isClustered: true
-            misfireThreshold: 60000
-            clusterCheckinInterval: 10000
-          threadPool:
-            class: org.quartz.simpl.SimpleThreadPool
-            threadCount: 10
-            threadPriority: 5
-            threadsInheritContextClassLoaderOfInitializingThread: true
-  #json 时间戳统一转换
-  jackson:
-    date-format:   yyyy-MM-dd HH:mm:ss
-    time-zone:   GMT+8
-  aop:
-    proxy-target-class: true
-  activiti:
-    check-process-definitions: false
-    #启用作业执行器
-    async-executor-activate: false
-    #启用异步执行器
-    job-executor-activate: false
-  jpa:
-    open-in-view: false
-  #配置freemarker
-  freemarker:
-    # 设置模板后缀名
-    suffix: .ftl
-    # 设置文档类型
-    content-type: text/html
-    # 设置页面编码格式
-    charset: UTF-8
-    # 设置页面缓存
-    cache: false
-    prefer-file-system-access: false
-    # 设置ftl文件路径
-    template-loader-path:
-      - classpath:/templates
-  # 设置静态文件路径,js,css等
-  mvc:
-    static-path-pattern: /**
-  resource:
-    static-locations: classpath:/static/,classpath:/public/
-  autoconfigure:
-    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
-  datasource:
-    druid:
-      stat-view-servlet:
-        enabled: true
-        loginUsername: admin
-        loginPassword: 123456
-        allow:
-      web-stat-filter:
-        enabled: true
-    dynamic:
-      druid: # 全局druid参数,绝大部分值和默认保持一致。(现已支持的参数如下,不清楚含义不要乱设置)
-        # 连接池的配置信息
-        # 初始化大小,最小,最大
-        initial-size: 5
-        min-idle: 5
-        maxActive: 20
-        # 配置获取连接等待超时的时间
-        maxWait: 60000
-        # 配置间隔多久才进行一次检测,检测需要关闭的空闲连接,单位是毫秒
-        timeBetweenEvictionRunsMillis: 60000
-        # 配置一个连接在池中最小生存的时间,单位是毫秒
-        minEvictableIdleTimeMillis: 300000
-        validationQuery: SELECT 1 FROM DUAL
-        testWhileIdle: true
-        testOnBorrow: false
-        testOnReturn: false
-        # 打开PSCache,并且指定每个连接上PSCache的大小
-        poolPreparedStatements: true
-        maxPoolPreparedStatementPerConnectionSize: 20
-        # 配置监控统计拦截的filters,去掉后监控界面sql无法统计,'wall'用于防火墙
-        filters: stat,wall,slf4j
-        # 通过connectProperties属性来打开mergeSql功能;慢SQL记录
-        connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
-      datasource:
-          master:
-            url: jdbc:mysql://139.186.165.84:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
-            username: hcst
-            password: hcst@2020
-            driver-class-name: com.mysql.cj.jdbc.Driver
-          # 多数据源配置
-          #multi-datasource1:
-            #url: jdbc:mysql://localhost:3306/jeecg-boot2?useUnicode=true&characterEncoding=utf8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
-            #username: root
-            #password: root
-            #driver-class-name: com.mysql.cj.jdbc.Driver
-  #redis 配置
-#  redis:
-#     database: 0
-#     host: 192.168.1.199
-#     lettuce:
-#       pool:
-#         max-active: 8   #最大连接数据库连接数,设 -1 为没有限制
-#         max-idle: 8     #最大等待连接中的数量,设 0 为没有限制
-#         max-wait: -1ms  #最大建立连接等待时间。如果超过此时间将接到异常。设为-1表示无限制。
-#         min-idle: 0     #最小等待连接中的数量,设 0 为没有限制
-#       shutdown-timeout: 100ms
-#     password: ''
-#     port: 6379
-#mybatis plus 设置
-mybatis-plus:
-   mapper-locations: classpath*:ctop/bytedance/ad/**/**/xml/*Mapper.xml
-   global-config:
-    # 关闭MP3.0自带的banner
-    banner: false
-    db-config:
-      #主键类型
-      id-type: ASSIGN_ID
-      # 默认数据库表下划线命名
-      table-underline: true
-   configuration:
-    # 这个配置会将执行的sql打印出来,在开发或测试的时候可以用
-    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
-    # 返回类型为Map,显示null对应的字段
-    call-setters-on-nulls: true
-#jeecg专用配置
-minidao :
-  base-package: org.jeecg.modules.jmreport.*
-  #DB类型(mysql | postgresql | oracle | sqlserver| other)
-  db-type: mysql
-jeecg :
-  # 本地:local\Minio:minio\阿里云:alioss
-  uploadType: local
-  path :
-    #文件上传根目录 设置
-    upload: D://opt//upFiles
-    #webapp文件路径
-    webapp: D://opt//webapp
-  shiro:
-     excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/**
-  #阿里云oss存储和大鱼短信秘钥配置
-  oss:
-    accessKey: ??
-    secretKey: ??
-    endpoint: oss-cn-beijing.aliyuncs.com
-    bucketName: ??
-    staticDomain: https://static.jeecg.com
-  # ElasticSearch 设置
-  elasticsearch:
-    cluster-name: jeecg-ES
-    cluster-nodes: ??
-    check-enabled: false
-  # 表单设计器配置
-  desform:
-    # 主题颜色(仅支持 16进制颜色代码)
-    theme-color: "#1890ff"
-    # 文件、图片上传方式,可选项:qiniu(七牛云)、system(跟随系统配置)
-    upload-type: system
-    map:
-      # 配置百度地图的AK,申请地址:https://lbs.baidu.com/apiconsole/key?application=key#/home
-      baidu: ??
-  # 在线预览文件服务器地址配置
-  file-view-domain: http://127.0.0.1:8012
-  # minio文件上传
-  minio:
-    minio_url: http://minio.jeecg.com
-    minio_name: ??
-    minio_pass: ??
-    bucketName: ??
-  #大屏报表参数设置
-  jmreport:
-    mode: prod
-    #数据字典是否进行saas数据隔离,自己看自己的字典
-    saas: false
-    #是否需要校验token
-    is_verify_token: false
-    #必须校验方法
-    verify_methods: remove,delete,save,add,update
-  #Wps在线文档
-  wps:
-    domain: https://wwo.wps.cn/office/
-    appid: ??
-    appsecret: ??
-  #xxl-job配置
-  xxljob:
-    enabled: false
-    adminAddresses: http://127.0.0.1:9080/xxl-job-admin
-    appname: ${spring.application.name}
-    accessToken: ''
-    address: 127.0.0.1:30007
-    ip: 127.0.0.1
-    port: 30007
-    logPath: logs/jeecg/job/jobhandler/
-    logRetentionDays: 30
-   #自定义路由配置 yml nacos database
-  route:
-    config:
-      data-id: jeecg-gateway-router
-      group: DEFAULT_GROUP
-      data-type: yml
-  #分布式锁配置
-  redisson:
-    address: 127.0.0.1:6379
-    password:
-    type: STANDALONE
-    enabled: true
-#Mybatis输出sql日志
-logging:
-  level:
-    org.jeecg.modules.system.mapper : info
-#cas单点登录
-cas:
-  prefixUrl: http://cas.example.org:8443/cas
-#swagger
-knife4j:
-  production: false
-  basic:
-    enable: true
-    username: jeecg
-    password: jeecg1314
-#第三方登录
-justauth:
-  enabled: true
-  type:
-    GITHUB:
-      client-id: ??
-      client-secret: ??
-      redirect-uri: http://sso.test.com:8080/jeecg-boot/sys/thirdLogin/github/callback
-    WECHAT_ENTERPRISE:
-      client-id: ??
-      client-secret: ??
-      redirect-uri: http://sso.test.com:8080/jeecg-boot/sys/thirdLogin/wechat_enterprise/callback
-      agent-id: ??
-    DINGTALK:
-      client-id: ??
-      client-secret: ??
-      redirect-uri: http://sso.test.com:8080/jeecg-boot/sys/thirdLogin/dingtalk/callback
-    WECHAT_OPEN:
-      client-id: ??
-      client-secret: ??
-      redirect-uri: http://sso.test.com:8080/jeecg-boot/sys/thirdLogin/wechat_open/callback
-  cache:
-    type: default
-    prefix: 'demo::'
-    timeout: 1h
-#第三方APP对接
-third-app:
-  enabled: false
-  type:
-    #企业微信
-    WECHAT_ENTERPRISE:
-      enabled: false
-      #CORP_ID
-      client-id: ??
-      #SECRET
-      client-secret: ??
-      #自建应用id
-      agent-id: ??
-      #自建应用秘钥(新版企微需要配置)
-      # agent-app-secret: ??
-    #钉钉
-    DINGTALK:
-      enabled: false
-      # appKey
-      client-id: ??
-      # appSecret
-      client-secret: ??
-      agent-id: ??

+ 0 - 2
jeecg-boot-bytedance-ad/src/main/resources/application.yml

@@ -6,8 +6,6 @@ spring:
   main:
     allow-bean-definition-overriding: true
 
-
-
 oss:
   replace:
     replace-value: oss-cn-beijing

+ 0 - 5
jeecg-boot-common/pom.xml

@@ -29,11 +29,6 @@
             <version>1.1.2-beat1</version>
         </dependency>
         <dependency>
-            <groupId>com.github.pagehelper</groupId>
-            <artifactId>pagehelper-spring-boot-starter</artifactId>
-            <version>1.2.3</version>
-        </dependency>
-        <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
             <version>4.5.9</version>

+ 9 - 1
jeecg-boot-common/src/main/java/cn/com/ctop/common/module/JeecgBootCommonApplication.java

@@ -1,11 +1,19 @@
 package cn.com.ctop.common.module;
 
 import com.alibaba.dubbo.config.spring.context.annotation.EnableDubbo;
+import org.apache.shiro.spring.boot.autoconfigure.ShiroAnnotationProcessorAutoConfiguration;
+import org.apache.shiro.spring.boot.autoconfigure.ShiroAutoConfiguration;
+import org.apache.shiro.spring.boot.autoconfigure.ShiroBeanAutoConfiguration;
+import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.context.annotation.ComponentScan;
 
-@SpringBootApplication
+@SpringBootApplication(exclude = {ShiroAnnotationProcessorAutoConfiguration.class, ShiroAutoConfiguration.class, ShiroBeanAutoConfiguration.class})
 @EnableDubbo
+@ComponentScan(basePackages = {"cn.com.ctop","org.jeecg"})
+@MapperScan({"org.jeecg.modules","cn.com.ctop.common.module"})
 public class JeecgBootCommonApplication {
 
     public static void main(String[] args) {

+ 2 - 1
jeecg-boot-common/src/main/java/cn/com/ctop/common/module/material/service/impl/MaterialVideoFrameServiceImpl.java

@@ -12,6 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
@@ -24,7 +25,7 @@ import java.util.Map;
 @Service
 public class MaterialVideoFrameServiceImpl extends ServiceImpl<MaterialVideoFrameMapper, MaterialVideoFrame> implements IMaterialVideoFrameService {
 
-    @Autowired
+    @Resource
     MaterialVideoFrameMapper  materialVideoFrameMapper;
 
     @Value("${jeecg.path.image-upload}")

+ 0 - 889
jeecg-boot-common/src/main/java/cn/com/ctop/common/module/utils/QueryGenerator.java

@@ -1,889 +0,0 @@
-package cn.com.ctop.common.module.utils;
-
-import cn.com.ctop.common.module.service.ISysBaseApi;
-import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.beanutils.PropertyUtils;
-import org.jeecg.common.constant.CommonConstant;
-import org.jeecg.common.constant.DataBaseConstant;
-import org.jeecg.common.system.query.MatchTypeEnum;
-import org.jeecg.common.system.query.QueryCondition;
-import org.jeecg.common.system.query.QueryRuleEnum;
-import org.jeecg.common.system.util.JeecgDataAutorUtils;
-import org.jeecg.common.system.util.JwtUtil;
-import org.jeecg.common.system.vo.SysPermissionDataRuleModel;
-import org.jeecg.common.util.DateUtils;
-import org.jeecg.common.util.SqlInjectionUtil;
-import org.jeecg.common.util.oConvertUtils;
-import org.jeecgframework.core.util.ApplicationContextUtil;
-import org.springframework.util.NumberUtils;
-
-import java.beans.PropertyDescriptor;
-import java.io.UnsupportedEncodingException;
-import java.math.BigDecimal;
-import java.net.URLDecoder;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.*;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-@Slf4j
-public class QueryGenerator {
-    public static final String SQL_RULES_COLUMN = "SQL_RULES_COLUMN";
-
-    private static final String BEGIN = "_begin";
-    private static final String END = "_end";
-    /**
-     * 数字类型字段,拼接此后缀 接受多值参数
-     */
-    private static final String MULTI = "_MultiString";
-    private static final String STAR = "*";
-    private static final String COMMA = ",";
-    private static final String NOT_EQUAL = "!";
-    /**
-     * 页面带有规则值查询,空格作为分隔符
-     */
-    private static final String QUERY_SEPARATE_KEYWORD = " ";
-    /**
-     * 高级查询前端传来的参数名
-     */
-    private static final String SUPER_QUERY_PARAMS = "superQueryParams";
-    /**
-     * 高级查询前端传来的拼接方式参数名
-     */
-    private static final String SUPER_QUERY_MATCH_TYPE = "superQueryMatchType";
-    /**
-     * 单引号
-     */
-    public static final String SQL_SQ = "'";
-    /**
-     * 排序列
-     */
-    private static final String ORDER_COLUMN = "column";
-    /**
-     * 排序方式
-     */
-    private static final String ORDER_TYPE = "order";
-    private static final String ORDER_TYPE_ASC = "ASC";
-
-    /**
-     * 时间格式化
-     */
-    private static final ThreadLocal<SimpleDateFormat> local = new ThreadLocal<SimpleDateFormat>();
-
-    private static SimpleDateFormat getTime() {
-        SimpleDateFormat time = local.get();
-        if (time == null) {
-            time = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-            local.set(time);
-        }
-        return time;
-    }
-
-    /**
-     * 获取查询条件构造器QueryWrapper实例 通用查询条件已被封装完成
-     *
-     * @param searchObj    查询实体
-     * @param parameterMap request.getParameterMap()
-     * @return QueryWrapper实例
-     */
-    public static <T> QueryWrapper<T> initQueryWrapper(T searchObj, Map<String, String[]> parameterMap) {
-        long start = System.currentTimeMillis();
-        QueryWrapper<T> queryWrapper = new QueryWrapper<T>();
-        installMplus(queryWrapper, searchObj, parameterMap);
-        log.debug("---查询条件构造器初始化完成,耗时:" + (System.currentTimeMillis() - start) + "毫秒----");
-        return queryWrapper;
-    }
-
-    /**
-     * 组装Mybatis Plus 查询条件
-     * <p>使用此方法 需要有如下几点注意:
-     * <br>1.使用QueryWrapper 而非LambdaQueryWrapper;
-     * <br>2.实例化QueryWrapper时不可将实体传入参数
-     * <br>错误示例:如QueryWrapper<JeecgDemo> queryWrapper = new QueryWrapper<JeecgDemo>(jeecgDemo);
-     * <br>正确示例:QueryWrapper<JeecgDemo> queryWrapper = new QueryWrapper<JeecgDemo>();
-     * <br>3.也可以不使用这个方法直接调用 {@link #initQueryWrapper}直接获取实例
-     */
-    public static void installMplus(QueryWrapper<?> queryWrapper, Object searchObj, Map<String, String[]> parameterMap) {
-
-		/*
-		 * 注意:权限查询由前端配置数据规则 当一个人有多个所属部门时候 可以在规则配置包含条件 orgCode 包含 #{sys_org_code}
-		但是不支持在自定义SQL中写orgCode in #{sys_org_code}
-		当一个人只有一个部门 就直接配置等于条件: orgCode 等于 #{sys_org_code} 或者配置自定义SQL: orgCode = '#{sys_org_code}'
-		*/
-
-        //区间条件组装 模糊查询 高级查询组装 简单排序 权限查询
-        PropertyDescriptor[] origDescriptors = PropertyUtils.getPropertyDescriptors(searchObj);
-        Map<String, SysPermissionDataRuleModel> ruleMap = getRuleMap();
-
-        //权限规则自定义SQL表达式
-        for (String c : ruleMap.keySet()) {
-            if (oConvertUtils.isNotEmpty(c) && c.startsWith(SQL_RULES_COLUMN)) {
-                queryWrapper.and(i -> i.apply(getSqlRuleValue(ruleMap.get(c).getRuleValue())));
-            }
-        }
-
-        String name, type;
-        for (int i = 0; i < origDescriptors.length; i++) {
-            //aliasName = origDescriptors[i].getName();  mybatis  不存在实体属性 不用处理别名的情况
-            name = origDescriptors[i].getName();
-            type = origDescriptors[i].getPropertyType().toString();
-            try {
-                if (judgedIsUselessField(name) || !PropertyUtils.isReadable(searchObj, name)) {
-                    continue;
-                }
-
-                //数据权限查询
-                if (ruleMap.containsKey(name)) {
-                    addRuleToQueryWrapper(ruleMap.get(name), name, origDescriptors[i].getPropertyType(), queryWrapper);
-                }
-
-                // 添加 判断是否有区间值
-                String endValue = null, beginValue = null;
-                if (parameterMap != null && parameterMap.containsKey(name + BEGIN)) {
-                    beginValue = parameterMap.get(name + BEGIN)[0].trim();
-                    addQueryByRule(queryWrapper, name, type, beginValue, QueryRuleEnum.GE);
-
-                }
-                if (parameterMap != null && parameterMap.containsKey(name + END)) {
-                    endValue = parameterMap.get(name + END)[0].trim();
-                    addQueryByRule(queryWrapper, name, type, endValue, QueryRuleEnum.LE);
-                }
-                //多值查询
-                if (parameterMap != null && parameterMap.containsKey(name + MULTI)) {
-                    endValue = parameterMap.get(name + MULTI)[0].trim();
-                    addQueryByRule(queryWrapper, name.replace(MULTI, ""), type, endValue, QueryRuleEnum.IN);
-                }
-
-                //判断单值  参数带不同标识字符串 走不同的查询
-                //TODO 这种前后带逗号的支持分割后模糊查询需要否 使多选字段的查询生效
-                Object value = PropertyUtils.getSimpleProperty(searchObj, name);
-                if (null != value && value.toString().startsWith(COMMA) && value.toString().endsWith(COMMA)) {
-                    String multiLikeval = value.toString().replace(",,", COMMA);
-                    String[] vals = multiLikeval.substring(1, multiLikeval.length()).split(COMMA);
-                    final String field = oConvertUtils.camelToUnderline(name);
-                    if (vals.length > 1) {
-                        queryWrapper.and(j -> {
-                            j = j.like(field, vals[0]);
-                            for (int k = 1; k < vals.length; k++) {
-                                j = j.or().like(field, vals[k]);
-                            }
-                            //     return j;
-                        });
-                    } else {
-                        queryWrapper.and(j -> j.like(field, vals[0]));
-                    }
-                } else {
-                    //根据参数值带什么关键字符串判断走什么类型的查询
-                    QueryRuleEnum rule = convert2Rule(value);
-                    value = replaceValue(rule, value);
-                    // add -begin 添加判断为字符串时设为全模糊查询
-                    //if( (rule==null || QueryRuleEnum.EQ.equals(rule)) && "class java.lang.String".equals(type)) {
-                    // 可以设置左右模糊或全模糊,因人而异
-                    //rule = QueryRuleEnum.LIKE;
-                    //}
-                    // add -end 添加判断为字符串时设为全模糊查询
-                    addEasyQuery(queryWrapper, name, rule, value);
-                }
-
-            } catch (Exception e) {
-                log.error(e.getMessage(), e);
-            }
-        }
-        // 排序逻辑 处理
-        doMultiFieldsOrder(queryWrapper, parameterMap);
-
-        //高级查询
-        doSuperQuery(queryWrapper, parameterMap);
-
-    }
-
-    //多字段排序 TODO 需要修改前端
-    public static void doMultiFieldsOrder(QueryWrapper<?> queryWrapper, Map<String, String[]> parameterMap) {
-        String column = null, order = null;
-        if (parameterMap != null && parameterMap.containsKey(ORDER_COLUMN)) {
-            column = parameterMap.get(ORDER_COLUMN)[0];
-        }
-        if (parameterMap != null && parameterMap.containsKey(ORDER_TYPE)) {
-            order = parameterMap.get(ORDER_TYPE)[0];
-        }
-        log.debug("排序规则>>列:" + column + ",排序方式:" + order);
-        if (oConvertUtils.isNotEmpty(column) && oConvertUtils.isNotEmpty(order)) {
-            //字典字段,去掉字典翻译文本后缀
-            if (column.endsWith(CommonConstant.DICT_TEXT_SUFFIX)) {
-                column = column.substring(0, column.lastIndexOf(CommonConstant.DICT_TEXT_SUFFIX));
-            }
-            //SQL注入check
-            SqlInjectionUtil.filterContent(column);
-
-            if (order.toUpperCase().indexOf(ORDER_TYPE_ASC) >= 0) {
-                queryWrapper.orderByAsc(oConvertUtils.camelToUnderline(column));
-            } else {
-                queryWrapper.orderByDesc(oConvertUtils.camelToUnderline(column));
-            }
-        }
-    }
-
-    /**
-     * 高级查询
-     *
-     * @param queryWrapper
-     * @param parameterMap
-     */
-    public static void doSuperQuery(QueryWrapper<?> queryWrapper, Map<String, String[]> parameterMap) {
-        if (parameterMap != null && parameterMap.containsKey(SUPER_QUERY_PARAMS)) {
-            String superQueryParams = parameterMap.get(SUPER_QUERY_PARAMS)[0];
-            String superQueryMatchType = parameterMap.get(SUPER_QUERY_MATCH_TYPE) != null ? parameterMap.get(SUPER_QUERY_MATCH_TYPE)[0] : MatchTypeEnum.AND.getValue();
-            MatchTypeEnum matchType = MatchTypeEnum.getByValue(superQueryMatchType);
-            // update-begin--Author:sunjianlei  Date:20200325 for:高级查询的条件要用括号括起来,防止和用户的其他条件冲突 -------
-            try {
-                superQueryParams = URLDecoder.decode(superQueryParams, "UTF-8");
-                List<QueryCondition> conditions = JSON.parseArray(superQueryParams, QueryCondition.class);
-                if (conditions == null || conditions.size() == 0) {
-                    return;
-                }
-                log.info("---高级查询参数-->" + conditions.toString());
-                queryWrapper.and(andWrapper -> {
-                    for (int i = 0; i < conditions.size(); i++) {
-                        QueryCondition rule = conditions.get(i);
-                        if (oConvertUtils.isNotEmpty(rule.getField())
-                                && oConvertUtils.isNotEmpty(rule.getRule())
-                                && oConvertUtils.isNotEmpty(rule.getVal())) {
-
-                            log.debug("SuperQuery ==> " + rule.toString());
-                            addEasyQuery(andWrapper, rule.getField(), QueryRuleEnum.getByValue(rule.getRule()), rule.getVal());
-
-                            // 如果拼接方式是OR,就拼接OR
-                            if (MatchTypeEnum.OR == matchType && i < (conditions.size() - 1)) {
-                                andWrapper.or();
-                            }
-                        }
-                    }
-                    // return andWrapper;
-                });
-            } catch (UnsupportedEncodingException e) {
-                log.error("--高级查询参数转码失败:" + superQueryParams, e);
-            } catch (Exception e) {
-                log.error("--高级查询拼接失败:" + e.getMessage());
-                e.printStackTrace();
-            }
-            // update-end--Author:sunjianlei  Date:20200325 for:高级查询的条件要用括号括起来,防止和用户的其他条件冲突 -------
-        }
-        //log.info(" superQuery getCustomSqlSegment: "+ queryWrapper.getCustomSqlSegment());
-    }
-
-    /**
-     * 根据所传的值 转化成对应的比较方式
-     * 支持><= like in !
-     *
-     * @param value
-     * @return
-     */
-    private static QueryRuleEnum convert2Rule(Object value) {
-        // 避免空数据
-        if (value == null) {
-            return null;
-        }
-        String val = (value + "").toString().trim();
-        if (val.length() == 0) {
-            return null;
-        }
-        QueryRuleEnum rule = null;
-
-        //update-begin--Author:scott  Date:20190724 for:initQueryWrapper组装sql查询条件错误 #284-------------------
-        //TODO 此处规则,只适用于 le lt ge gt
-        // step 2 .>= =<
-        if (rule == null && val.length() >= 3) {
-            if (QUERY_SEPARATE_KEYWORD.equals(val.substring(2, 3))) {
-                rule = QueryRuleEnum.getByValue(val.substring(0, 2));
-            }
-        }
-        // step 1 .> <
-        if (rule == null && val.length() >= 2) {
-            if (QUERY_SEPARATE_KEYWORD.equals(val.substring(1, 2))) {
-                rule = QueryRuleEnum.getByValue(val.substring(0, 1));
-            }
-        }
-        //update-end--Author:scott  Date:20190724 for:initQueryWrapper组装sql查询条件错误 #284---------------------
-
-        // step 3 like
-        if (rule == null && val.contains(STAR)) {
-            if (val.startsWith(STAR) && val.endsWith(STAR)) {
-                rule = QueryRuleEnum.LIKE;
-            } else if (val.startsWith(STAR)) {
-                rule = QueryRuleEnum.LEFT_LIKE;
-            } else if (val.endsWith(STAR)) {
-                rule = QueryRuleEnum.RIGHT_LIKE;
-            }
-        }
-        // step 4 in
-        if (rule == null && val.contains(COMMA)) {
-            //TODO in 查询这里应该有个bug  如果一字段本身就是多选 此时用in查询 未必能查询出来
-            rule = QueryRuleEnum.IN;
-        }
-        // step 5 !=
-        if (rule == null && val.startsWith(NOT_EQUAL)) {
-            rule = QueryRuleEnum.NE;
-        }
-        return rule != null ? rule : QueryRuleEnum.EQ;
-    }
-
-    /**
-     * 替换掉关键字字符
-     *
-     * @param rule
-     * @param value
-     * @return
-     */
-    private static Object replaceValue(QueryRuleEnum rule, Object value) {
-        if (rule == null) {
-            return null;
-        }
-        if (!(value instanceof String)) {
-            return value;
-        }
-        String val = (value + "").toString().trim();
-        if (rule == QueryRuleEnum.LIKE) {
-            value = val.substring(1, val.length() - 1);
-        } else if (rule == QueryRuleEnum.LEFT_LIKE || rule == QueryRuleEnum.NE) {
-            value = val.substring(1);
-        } else if (rule == QueryRuleEnum.RIGHT_LIKE) {
-            value = val.substring(0, val.length() - 1);
-        } else if (rule == QueryRuleEnum.IN) {
-            value = val.split(",");
-        } else {
-            //update-begin--Author:scott  Date:20190724 for:initQueryWrapper组装sql查询条件错误 #284-------------------
-            if (val.startsWith(rule.getValue())) {
-                //TODO 此处逻辑应该注释掉-> 如果查询内容中带有查询匹配规则符号,就会被截取的(比如:>=您好)
-                value = val.replaceFirst(rule.getValue(), "");
-            } else if (val.startsWith(rule.getCondition() + QUERY_SEPARATE_KEYWORD)) {
-                value = val.replaceFirst(rule.getCondition() + QUERY_SEPARATE_KEYWORD, "").trim();
-            }
-            //update-end--Author:scott  Date:20190724 for:initQueryWrapper组装sql查询条件错误 #284-------------------
-        }
-        return value;
-    }
-
-    private static void addQueryByRule(QueryWrapper<?> queryWrapper, String name, String type, String value, QueryRuleEnum rule) throws ParseException {
-        if (oConvertUtils.isNotEmpty(value)) {
-            Object temp;
-            // 针对数字类型字段,多值查询
-            if (value.indexOf(COMMA) != -1) {
-                temp = value;
-                addEasyQuery(queryWrapper, name, rule, temp);
-                return;
-            }
-
-            switch (type) {
-                case "class java.lang.Integer":
-                    temp = Integer.parseInt(value);
-                    break;
-                case "class java.math.BigDecimal":
-                    temp = new BigDecimal(value);
-                    break;
-                case "class java.lang.Short":
-                    temp = Short.parseShort(value);
-                    break;
-                case "class java.lang.Long":
-                    temp = Long.parseLong(value);
-                    break;
-                case "class java.lang.Float":
-                    temp = Float.parseFloat(value);
-                    break;
-                case "class java.lang.Double":
-                    temp = Double.parseDouble(value);
-                    break;
-                case "class java.util.Date":
-                    temp = getDateQueryByRule(value, rule);
-                    break;
-                default:
-                    temp = value;
-                    break;
-            }
-            addEasyQuery(queryWrapper, name, rule, temp);
-        }
-    }
-
-    /**
-     * 获取日期类型的值
-     *
-     * @param value
-     * @param rule
-     * @return
-     * @throws ParseException
-     */
-    private static Date getDateQueryByRule(String value, QueryRuleEnum rule) throws ParseException {
-        Date date = null;
-        if (value.length() == 10) {
-            if (rule == QueryRuleEnum.GE) {
-                //比较大于
-                date = getTime().parse(value + " 00:00:00");
-            } else if (rule == QueryRuleEnum.LE) {
-                //比较小于
-                date = getTime().parse(value + " 23:59:59");
-            }
-            //TODO 日期类型比较特殊 可能oracle下不一定好使
-        }
-        if (date == null) {
-            date = getTime().parse(value);
-        }
-        return date;
-    }
-
-    /**
-     * 根据规则走不同的查询
-     *
-     * @param queryWrapper QueryWrapper
-     * @param name         字段名字
-     * @param rule         查询规则
-     * @param value        查询条件值
-     */
-    private static void addEasyQuery(QueryWrapper<?> queryWrapper, String name, QueryRuleEnum rule, Object value) {
-        if (value == null || rule == null || oConvertUtils.isEmpty(value)) {
-            return;
-        }
-        name = oConvertUtils.camelToUnderline(name);
-        switch (rule) {
-            case GT:
-                queryWrapper.gt(name, value);
-                break;
-            case GE:
-                queryWrapper.ge(name, value);
-                break;
-            case LT:
-                queryWrapper.lt(name, value);
-                break;
-            case LE:
-                queryWrapper.le(name, value);
-                break;
-            case EQ:
-                queryWrapper.eq(name, value);
-                break;
-            case NE:
-                queryWrapper.ne(name, value);
-                break;
-            case IN:
-                if (value instanceof String) {
-                    queryWrapper.in(name, (Object[]) value.toString().split(","));
-                } else if (value instanceof String[]) {
-                    queryWrapper.in(name, (Object[]) value);
-                } else {
-                    queryWrapper.in(name, value);
-                }
-                break;
-            case LIKE:
-                queryWrapper.like(name, value);
-                break;
-            case LEFT_LIKE:
-                queryWrapper.likeLeft(name, value);
-                break;
-            case RIGHT_LIKE:
-                queryWrapper.likeRight(name, value);
-                break;
-            default:
-                log.info("--查询规则未匹配到---");
-                break;
-        }
-    }
-
-    /**
-     * @param name
-     * @return
-     */
-    private static boolean judgedIsUselessField(String name) {
-        return "class".equals(name) || "ids".equals(name)
-                || "page".equals(name) || "rows".equals(name)
-                || "sort".equals(name) || "order".equals(name);
-    }
-
-
-    /**
-     * 获取请求对应的数据权限规则
-     *
-     * @return
-     */
-    public static Map<String, SysPermissionDataRuleModel> getRuleMap() {
-        Map<String, SysPermissionDataRuleModel> ruleMap = new HashMap<String, SysPermissionDataRuleModel>();
-        List<SysPermissionDataRuleModel> list = JeecgDataAutorUtils.loadDataSearchConditon();
-        if (list != null && list.size() > 0) {
-            if (list.get(0) == null) {
-                return ruleMap;
-            }
-            for (SysPermissionDataRuleModel rule : list) {
-                String column = rule.getRuleColumn();
-                if (QueryRuleEnum.SQL_RULES.getValue().equals(rule.getRuleConditions())) {
-                    column = SQL_RULES_COLUMN + rule.getId();
-                }
-                ruleMap.put(column, rule);
-            }
-        }
-        return ruleMap;
-    }
-
-    private static void addRuleToQueryWrapper(SysPermissionDataRuleModel dataRule, String name, Class propertyType, QueryWrapper<?> queryWrapper) {
-        QueryRuleEnum rule = QueryRuleEnum.getByValue(dataRule.getRuleConditions());
-        if (rule.equals(QueryRuleEnum.IN) && !propertyType.equals(String.class)) {
-            String[] values = dataRule.getRuleValue().split(",");
-            Object[] objs = new Object[values.length];
-            for (int i = 0; i < values.length; i++) {
-                objs[i] = NumberUtils.parseNumber(values[i], propertyType);
-            }
-            addEasyQuery(queryWrapper, name, rule, objs);
-        } else {
-            if (propertyType.equals(String.class)) {
-                addEasyQuery(queryWrapper, name, rule, converRuleValue(dataRule.getRuleValue()));
-            } else if (propertyType.equals(Date.class)) {
-                String dateStr = converRuleValue(dataRule.getRuleValue());
-                if (dateStr.length() == 10) {
-                    addEasyQuery(queryWrapper, name, rule, DateUtils.str2Date(dateStr, DateUtils.date_sdf.get()));
-                } else {
-                    addEasyQuery(queryWrapper, name, rule, DateUtils.str2Date(dateStr, DateUtils.datetimeFormat.get()));
-                }
-            } else {
-                addEasyQuery(queryWrapper, name, rule, NumberUtils.parseNumber(dataRule.getRuleValue(), propertyType));
-            }
-        }
-    }
-
-    public static String converRuleValue(String ruleValue) {
-        String value = JwtUtil.getSessionData(ruleValue);
-        if (oConvertUtils.isEmpty(value)) {
-            value = JwtUtil.getUserSystemData(ruleValue, null);
-        }
-        return value != null ? value : ruleValue;
-    }
-
-    /**
-     * @param ruleValue:
-     * @author: scott
-     * @Description: 去掉值前后单引号
-     * @date: 2020/3/19 21:26
-     * @Return: java.lang.String
-     */
-    public static String trimSingleQuote(String ruleValue) {
-        if (oConvertUtils.isEmpty(ruleValue)) {
-            return "";
-        }
-        if (ruleValue.startsWith(QueryGenerator.SQL_SQ)) {
-            ruleValue = ruleValue.substring(1);
-        }
-        if (ruleValue.endsWith(QueryGenerator.SQL_SQ)) {
-            ruleValue = ruleValue.substring(0, ruleValue.length() - 1);
-        }
-        return ruleValue;
-    }
-
-    public static String getSqlRuleValue(String sqlRule) {
-        try {
-            Set<String> varParams = getSqlRuleParams(sqlRule);
-            for (String var : varParams) {
-                String tempValue = converRuleValue(var);
-                sqlRule = sqlRule.replace("#{" + var + "}", tempValue);
-            }
-        } catch (Exception e) {
-            log.error(e.getMessage(), e);
-        }
-        return sqlRule;
-    }
-
-    /**
-     * 获取sql中的#{key} 这个key组成的set
-     */
-    public static Set<String> getSqlRuleParams(String sql) {
-        if (oConvertUtils.isEmpty(sql)) {
-            return null;
-        }
-        Set<String> varParams = new HashSet<String>();
-        String regex = "\\#\\{\\w+\\}";
-
-        Pattern p = Pattern.compile(regex);
-        Matcher m = p.matcher(sql);
-        while (m.find()) {
-            String var = m.group();
-            varParams.add(var.substring(var.indexOf("{") + 1, var.indexOf("}")));
-        }
-        return varParams;
-    }
-
-    /**
-     * 获取查询条件
-     *
-     * @param field
-     * @param alias
-     * @param value
-     * @param isString
-     * @return
-     */
-    public static String getSingleQueryConditionSql(String field, String alias, Object value, boolean isString) {
-        if (value == null) {
-            return "";
-        }
-        field = alias + oConvertUtils.camelToUnderline(field);
-        QueryRuleEnum rule = QueryGenerator.convert2Rule(value);
-        return getSingleSqlByRule(rule, field, value, isString);
-    }
-
-    public static String getSingleSqlByRule(QueryRuleEnum rule, String field, Object value, boolean isString) {
-        String res = "";
-        switch (rule) {
-            case GT:
-                res = field + rule.getValue() + getFieldConditionValue(value, isString);
-                break;
-            case GE:
-                res = field + rule.getValue() + getFieldConditionValue(value, isString);
-                break;
-            case LT:
-                res = field + rule.getValue() + getFieldConditionValue(value, isString);
-                break;
-            case LE:
-                res = field + rule.getValue() + getFieldConditionValue(value, isString);
-                break;
-            case EQ:
-                res = field + rule.getValue() + getFieldConditionValue(value, isString);
-                break;
-            case NE:
-                res = field + " <> " + getFieldConditionValue(value, isString);
-                break;
-            case IN:
-                res = field + " in " + getInConditionValue(value, isString);
-                break;
-            case LIKE:
-                res = field + " like " + getLikeConditionValue(value);
-                break;
-            case LEFT_LIKE:
-                res = field + " like " + getLikeConditionValue(value);
-                break;
-            case RIGHT_LIKE:
-                res = field + " like " + getLikeConditionValue(value);
-                break;
-            default:
-                res = field + " = " + getFieldConditionValue(value, isString);
-                break;
-        }
-        return res;
-    }
-
-    private static String getFieldConditionValue(Object value, boolean isString) {
-        String str = value.toString().trim();
-        if (str.startsWith("!")) {
-            str = str.substring(1);
-        } else if (str.startsWith(">=")) {
-            str = str.substring(2);
-        } else if (str.startsWith("<=")) {
-            str = str.substring(2);
-        } else if (str.startsWith(">")) {
-            str = str.substring(1);
-        } else if (str.startsWith("<")) {
-            str = str.substring(1);
-        }
-        if (isString) {
-            if (DataBaseConstant.DB_TYPE_SQLSERVER.equals(getDbType())) {
-                return " N'" + str + "' ";
-            } else {
-                return " '" + str + "' ";
-            }
-        } else {
-            return value.toString();
-        }
-    }
-
-    private static String getInConditionValue(Object value, boolean isString) {
-        if (isString) {
-            String[] temp = value.toString().split(",");
-            String res = "";
-            for (String string : temp) {
-                if (DataBaseConstant.DB_TYPE_SQLSERVER.equals(getDbType())) {
-                    res += ",N'" + string + "'";
-                } else {
-                    res += ",'" + string + "'";
-                }
-            }
-            return "(" + res.substring(1) + ")";
-        } else {
-            return "(" + value.toString() + ")";
-        }
-    }
-
-    private static String getLikeConditionValue(Object value) {
-        String str = value.toString().trim();
-        if (str.startsWith("*") && str.endsWith("*")) {
-            if (DataBaseConstant.DB_TYPE_SQLSERVER.equals(getDbType())) {
-                return "N'%" + str.substring(1, str.length() - 1) + "%'";
-            } else {
-                return "'%" + str.substring(1, str.length() - 1) + "%'";
-            }
-        } else if (str.startsWith("*")) {
-            if (DataBaseConstant.DB_TYPE_SQLSERVER.equals(getDbType())) {
-                return "N'%" + str.substring(1) + "'";
-            } else {
-                return "'%" + str.substring(1) + "'";
-            }
-        } else if (str.endsWith("*")) {
-            if (DataBaseConstant.DB_TYPE_SQLSERVER.equals(getDbType())) {
-                return "N'" + str.substring(0, str.length() - 1) + "%'";
-            } else {
-                return "'" + str.substring(0, str.length() - 1) + "%'";
-            }
-        } else {
-            if (str.indexOf("%") >= 0) {
-                if (DataBaseConstant.DB_TYPE_SQLSERVER.equals(getDbType())) {
-                    if (str.startsWith("'") && str.endsWith("'")) {
-                        return "N" + str;
-                    } else {
-                        return "N" + "'" + str + "'";
-                    }
-                } else {
-                    if (str.startsWith("'") && str.endsWith("'")) {
-                        return str;
-                    } else {
-                        return "'" + str + "'";
-                    }
-                }
-            } else {
-                if (DataBaseConstant.DB_TYPE_SQLSERVER.equals(getDbType())) {
-                    return "N'%" + str + "%'";
-                } else {
-                    return "'%" + str + "%'";
-                }
-            }
-        }
-    }
-
-    /**
-     * 根据权限相关配置生成相关的SQL 语句
-     *
-     * @return
-     */
-    @SuppressWarnings({"unchecked", "rawtypes"})
-    public static String installAuthJdbc(Class<?> clazz) {
-        StringBuffer sb = new StringBuffer();
-        //权限查询
-        Map<String, SysPermissionDataRuleModel> ruleMap = getRuleMap();
-        PropertyDescriptor[] origDescriptors = PropertyUtils.getPropertyDescriptors(clazz);
-        String sql_and = " and ";
-        for (String c : ruleMap.keySet()) {
-            if (oConvertUtils.isNotEmpty(c) && c.startsWith(SQL_RULES_COLUMN)) {
-                sb.append(sql_and + getSqlRuleValue(ruleMap.get(c).getRuleValue()));
-            }
-        }
-        String name;
-        for (int i = 0; i < origDescriptors.length; i++) {
-            name = origDescriptors[i].getName();
-            if (judgedIsUselessField(name)) {
-                continue;
-            }
-            if (ruleMap.containsKey(name)) {
-                SysPermissionDataRuleModel dataRule = ruleMap.get(name);
-                QueryRuleEnum rule = QueryRuleEnum.getByValue(dataRule.getRuleConditions());
-                Class propType = origDescriptors[i].getPropertyType();
-                boolean isString = propType.equals(String.class);
-                Object value;
-                if (isString) {
-                    value = converRuleValue(dataRule.getRuleValue());
-                } else {
-                    value = NumberUtils.parseNumber(dataRule.getRuleValue(), propType);
-                }
-                String filedSql = getSingleSqlByRule(rule, oConvertUtils.camelToUnderline(name), value, isString);
-                sb.append(sql_and + filedSql);
-            }
-        }
-        log.info("query auth sql is:" + sb.toString());
-        return sb.toString();
-    }
-
-    /**
-     * 根据权限相关配置 组装mp需要的权限
-     *
-     * @return
-     */
-    public static void installAuthMplus(QueryWrapper<?> queryWrapper, Class<?> clazz) {
-        //权限查询
-        Map<String, SysPermissionDataRuleModel> ruleMap = getRuleMap();
-        PropertyDescriptor[] origDescriptors = PropertyUtils.getPropertyDescriptors(clazz);
-        for (String c : ruleMap.keySet()) {
-            if (oConvertUtils.isNotEmpty(c) && c.startsWith(SQL_RULES_COLUMN)) {
-                queryWrapper.and(i -> i.apply(getSqlRuleValue(ruleMap.get(c).getRuleValue())));
-            }
-        }
-        String name;
-        for (int i = 0; i < origDescriptors.length; i++) {
-            name = origDescriptors[i].getName();
-            if (judgedIsUselessField(name)) {
-                continue;
-            }
-            if (ruleMap.containsKey(name)) {
-                addRuleToQueryWrapper(ruleMap.get(name), name, origDescriptors[i].getPropertyType(), queryWrapper);
-            }
-        }
-    }
-
-    /**
-     * 转换sql中的系统变量
-     *
-     * @param sql
-     * @return
-     */
-    public static String convertSystemVariables(String sql) {
-        return getSqlRuleValue(sql);
-    }
-
-    /**
-     * 获取所有配置的权限 返回sql字符串 不受字段限制 配置什么就拿到什么
-     *
-     * @return
-     */
-    public static String getAllConfigAuth() {
-        StringBuffer sb = new StringBuffer();
-        //权限查询
-        Map<String, SysPermissionDataRuleModel> ruleMap = getRuleMap();
-        String sql_and = " and ";
-        for (String c : ruleMap.keySet()) {
-            SysPermissionDataRuleModel dataRule = ruleMap.get(c);
-            String ruleValue = dataRule.getRuleValue();
-            if (oConvertUtils.isEmpty(ruleValue)) {
-                continue;
-            }
-            if (oConvertUtils.isNotEmpty(c) && c.startsWith(SQL_RULES_COLUMN)) {
-                sb.append(sql_and + getSqlRuleValue(ruleValue));
-            } else {
-                boolean isString = false;
-                ruleValue = ruleValue.trim();
-                if (ruleValue.startsWith("'") && ruleValue.endsWith("'")) {
-                    isString = true;
-                    ruleValue = ruleValue.substring(1, ruleValue.length() - 1);
-                }
-                QueryRuleEnum rule = QueryRuleEnum.getByValue(dataRule.getRuleConditions());
-                String value = converRuleValue(ruleValue);
-                String filedSql = getSingleSqlByRule(rule, c, value, isString);
-                sb.append(sql_and + filedSql);
-            }
-        }
-        log.info("query auth sql is = " + sb.toString());
-        return sb.toString();
-    }
-
-    /**
-     * 当前系统数据库类型
-     */
-    private static String DB_TYPE;
-
-    /**
-     * 获取系统数据库类型
-     */
-    private static String getDbType() {
-        if (oConvertUtils.isNotEmpty(DB_TYPE)) {
-            return DB_TYPE;
-        }
-        try {
-            ISysBaseApi sysBaseAPI = ApplicationContextUtil.getContext().getBean(ISysBaseApi.class);
-            DB_TYPE = sysBaseAPI.getDatabaseType();
-            return DB_TYPE;
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return DB_TYPE;
-    }
-}
-

+ 15 - 0
jeecg-boot-common/src/main/resources/application.yml

@@ -5,3 +5,18 @@ spring:
         name: jeecg-common
     main:
         allow-bean-definition-overriding: true
+jeecg:
+    path:
+        #文件上传根目录 设置
+        upload: /data/upload
+        #webapp文件路径
+        webapp: /data/webapp
+        video-upload: /data/upload/video/
+        image-upload: /data/upload/image/
+        kuaishou-agent-image: /data/upload/image/temp.png
+        kuaishou-account-captcha-image: /data/upload/image/captcha.png
+        chrome-driver: /usr/bin/chromedriver
+        csv-upload: /data/upload/csv/
+        bak-database-file: /data/data/bak/
+        report-history: /data/upload/report/history/
+        report-daily: /data/upload/report/daily/

+ 8 - 0
jeecg-boot-common/src/main/resources/config.properties

@@ -0,0 +1,8 @@
+#Tencent config
+qcloud.accessKeyId=AKIDE6IpMi8fJQRCg1iuWzFajjRs43kbbets
+qcloud.accessKeySecret=1rkPz7JNoXk8sJevPaeYHWqfkQXBGh
+
+#Tencent COS config
+qcloud.cos.endpoint=https://cos.ap-chongqing.myqcloud.com
+qcloud.cos.bucketName=media-1301855440
+qcloud.cos.folder=model/video/