Skip to content

Commit 834a5a0

Browse files
committed
1.1版本
修正admin中user在添加了druid后的提交出错问题
1 parent 4af3d56 commit 834a5a0

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+2658
-1574
lines changed

.idea/dataSources.xml

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/workspace.xml

+470-483
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

History.md

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
|Date|Version|Comment|
2+
|---|---|---|
3+
|2017.1.4|1.1|解决admin user 解决插入错误,修改wallfilter的配置,改为ajax提交|
4+
|2016.12.15|1.0| |

pom.xml

+54-7
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<modelVersion>4.0.0</modelVersion>
1010
<groupId>net.liuxuan</groupId>
1111
<artifactId>SpringBootTest</artifactId>
12-
<version>1.0-SNAPSHOT</version>
12+
<version>1.1-SNAPSHOT</version>
1313
<packaging>jar</packaging>
1414
<!--<packaging>war</packaging>-->
1515

@@ -494,7 +494,7 @@
494494
<!-- Package as an executable JAR -->
495495
<build>
496496
<plugins>
497-
<plugin>
497+
<!--<plugin>
498498
<groupId>org.springframework.boot</groupId>
499499
<artifactId>spring-boot-maven-plugin</artifactId>
500500
<version>${spring.boot.version}</version>
@@ -510,13 +510,60 @@
510510
</goals>
511511
</execution>
512512
</executions>
513-
</plugin>
514-
<!-- <plugin>
515-
<groupId>org.mybatis.generator</groupId>
516-
<artifactId>mybatis-generator-maven-plugin</artifactId>
517-
<version>1.3.2</version>
518513
</plugin>-->
519514

515+
516+
<plugin>
517+
<groupId>org.apache.maven.plugins</groupId>
518+
<artifactId>maven-jar-plugin</artifactId>
519+
<version>2.5</version>
520+
<configuration>
521+
<archive>
522+
<!-- 添加index则不从mainfest中读取classpath,而是从Index.list中读取 -->
523+
<!-- <index>true</index> -->
524+
<manifest>
525+
<mainClass>net.liuxuan.ApplicationMain</mainClass>
526+
<!-- to create a class path to your dependecies you have to fill true
527+
in this field -->
528+
<addClasspath>true</addClasspath>
529+
<classpathPrefix>lib/</classpathPrefix>
530+
<!--<classpathLayoutType>custom</classpathLayoutType> <customClasspathLayout>
531+
lib/$${artifact.groupId}.$${artifact.artifactId}.$${artifact.extension} </customClasspathLayout> -->
532+
</manifest>
533+
<manifestEntries>
534+
<Class-Path>./</Class-Path>
535+
</manifestEntries>
536+
</archive>
537+
<excludes>
538+
<exclude>config/**</exclude>
539+
<exclude>templates/**</exclude>
540+
<exclude>static/**</exclude>
541+
<exclude>logback.xml</exclude>
542+
<exclude>nouse/**</exclude>
543+
</excludes>
544+
</configuration>
545+
</plugin>
546+
547+
<plugin>
548+
<artifactId>maven-assembly-plugin</artifactId>
549+
<configuration>
550+
<!-- not append assembly id in release file name -->
551+
<appendAssemblyId>false</appendAssemblyId>
552+
<descriptors>
553+
<descriptor>src/main/build/package.xml</descriptor>
554+
</descriptors>
555+
</configuration>
556+
<executions>
557+
<execution>
558+
<id>make-assembly</id>
559+
<phase>package</phase>
560+
<goals>
561+
<goal>single</goal>
562+
</goals>
563+
</execution>
564+
</executions>
565+
</plugin>
566+
520567
<!--
521568
<plugin>
522569
<artifactId>maven-failsafe-plugin</artifactId>

0 commit comments

Comments
 (0)