github/dataease
github/dataease
3
0
Fork 1
mirror of https://github.com/dataease/dataease.git synced 2025-02-24 19:42:56 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fix: 依赖冲突

Browse Source
This commit is contained in:
taojinlong 2022-06-17 13:26:40 +08:00
parent 1e12eb5b64
commit 2cfc3b457e
2 changed files with 39 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
backend/pom.xml
View File

@ -112,7 +112,7 @@
<dependency> <dependency>
<groupId>com.github.pagehelper</groupId> <groupId>com.github.pagehelper</groupId>
<artifactId>pagehelper</artifactId> <artifactId>pagehelper</artifactId>
<version>5.0.3</version> <version>5.3.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.shiro</groupId> <groupId>org.apache.shiro</groupId>
@ -329,11 +329,6 @@
<groupId>org.apache.commons</groupId> <groupId>org.apache.commons</groupId>
<artifactId>commons-pool2</artifactId> <artifactId>commons-pool2</artifactId>
</dependency> </dependency>
<dependency>
<groupId>com.github.jsqlparser</groupId>
<artifactId>jsqlparser</artifactId>
<version>4.4</version>
</dependency>
</dependencies> </dependencies>
<build> <build>
@ -482,45 +477,45 @@
<build> <build>
<plugins> <plugins>
<plugin> <!-- <plugin>-->
<groupId>org.apache.maven.plugins</groupId> <!-- <groupId>org.apache.maven.plugins</groupId>-->
<artifactId>maven-antrun-plugin</artifactId> <!-- <artifactId>maven-antrun-plugin</artifactId>-->
<executions> <!-- <executions>-->
<execution> <!-- <execution>-->
<?m2e execute onConfiguration?> <!-- <?m2e execute onConfiguration?>-->
<id>main-class-placement</id> <!-- <id>main-class-placement</id>-->
<phase>generate-resources</phase> <!-- <phase>generate-resources</phase>-->
<configuration> <!-- <configuration>-->
<target> <!-- <target>-->
<move todir="src/main/resources/static"> <!-- <move todir="src/main/resources/static">-->
<fileset dir="../frontend/dist"> <!-- <fileset dir="../frontend/dist">-->
<exclude name="*.html"/> <!-- <exclude name="*.html"/>-->
</fileset> <!-- </fileset>-->
</move> <!-- </move>-->
<move todir="src/main/resources/templates"> <!-- <move todir="src/main/resources/templates">-->
<fileset dir="../frontend/dist"> <!-- <fileset dir="../frontend/dist">-->
<include name="*.html"/> <!-- <include name="*.html"/>-->
</fileset> <!-- </fileset>-->
</move> <!-- </move>-->
<copy todir="src/main/resources/static/de-app"> <!-- <copy todir="src/main/resources/static/de-app">-->
<fileset dir="../mobile/dist"> <!-- <fileset dir="../mobile/dist">-->
<exclude name="*.html"/> <!-- <exclude name="*.html"/>-->
</fileset> <!-- </fileset>-->
</copy> <!-- </copy>-->
<copy file="../mobile/dist/index.html" tofile="src/main/resources/templates/app.html" /> <!-- <copy file="../mobile/dist/index.html" tofile="src/main/resources/templates/app.html" />-->
</target> <!-- </target>-->
</configuration> <!-- </configuration>-->
<goals> <!-- <goals>-->
<goal>run</goal> <!-- <goal>run</goal>-->
</goals> <!-- </goals>-->
</execution> <!-- </execution>-->
</executions> <!-- </executions>-->
</plugin> <!-- </plugin>-->
</plugins> </plugins>
</build> </build>
</profile> </profile>

8
backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
View File

@ -2517,11 +2517,11 @@ public class DataSetTableService {
return; return;
} }
visitBinaryExpression(likeExpression, (likeExpression.isNot() ? " NOT" : "") + (likeExpression.isCaseInsensitive() ? " ILIKE " : " LIKE ")); visitBinaryExpression(likeExpression,
Expression escape = likeExpression.getEscape(); (likeExpression.isNot() ? " NOT" : "") + (likeExpression.isCaseInsensitive() ? " ILIKE " : " LIKE "));
String escape = likeExpression.getEscape();
if (escape != null) { if (escape != null) {
getBuffer().append(" ESCAPE "); buffer.append(" ESCAPE '").append(escape).append('\'');
likeExpression.getEscape().accept(this);
} }
} }