donghuang/tigon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update project version revision

Browse Source
This commit is contained in:
Shaun Chyxion 2022-12-25 18:39:35 +08:00
parent 1719833977
commit 6ca1141502
19 changed files with 56 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
codegen/pom.xml
View File

@ -13,7 +13,7 @@
<parent>
<groupId>me.chyxion.tigon</groupId>
<artifactId>tigon</artifactId>
<version>0.0.4-SNAPSHOT</version>
<version>${revision}</version>
</parent>
<properties>

2
common/pom.xml
View File

@ -13,7 +13,7 @@
<parent>
<groupId>me.chyxion.tigon</groupId>
<artifactId>tigon</artifactId>
<version>0.0.4-SNAPSHOT</version>
<version>${revision}</version>
</parent>
<dependencies>

2
extjs/pom.xml vendored
View File

@ -13,7 +13,7 @@
<parent>
<groupId>me.chyxion.tigon</groupId>
<artifactId>tigon</artifactId>
<version>0.0.4-SNAPSHOT</version>
<version>${revision}</version>
</parent>
<dependencies>

2
i18n/pom.xml
View File

@ -12,7 +12,7 @@
<parent>
<groupId>me.chyxion.tigon</groupId>
<artifactId>tigon</artifactId>
<version>0.0.4-SNAPSHOT</version>
<version>${revision}</version>
</parent>
<dependencies>

2
install.sh
View File

@ -23,6 +23,6 @@ pushd $(dirname "$prg_path") > /dev/null
WORK_DIR=$(pwd)
echo "Work dir [$WORK_DIR]"
mvn -T 4C -DskipTests clean source:jar install
mvn -T 4C -DskipTests clean flatten:flatten source:jar install
popd > /dev/null

2
kit/pom.xml
View File

@ -12,7 +12,7 @@
<parent>
<groupId>me.chyxion.tigon</groupId>
<artifactId>tigon</artifactId>
<version>0.0.4-SNAPSHOT</version>
<version>${revision}</version>
</parent>
<dependencies>

2
model/pom.xml
View File

@ -13,7 +13,7 @@
<parent>
<groupId>me.chyxion.tigon</groupId>
<artifactId>tigon</artifactId>
<version>0.0.4-SNAPSHOT</version>
<version>${revision}</version>
</parent>
<dependencies>

32
pom.xml
View File

@ -7,7 +7,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>me.chyxion.tigon</groupId>
<artifactId>tigon</artifactId>
<version>0.0.4-SNAPSHOT</version>
<version>${revision}</version>
<packaging>pom</packaging>
<name>Tigon</name>
<description>Tigon</description>
@ -22,6 +22,8 @@
<spring.version>5.3.13</spring.version>
<spring-boot.version>2.5.7</spring-boot.version>
<tigon-mybatis.version>0.0.8</tigon-mybatis.version>
<revision>0.0.4-SNAPSHOT</revision>
</properties>
<modules>
@ -45,7 +47,7 @@
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.2</version>
<version>1.18.24</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson</groupId>
@ -171,6 +173,32 @@
</plugins>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>flatten-maven-plugin</artifactId>
<version>1.3.0</version>
<configuration>
<embedBuildProfileDependencies>true</embedBuildProfileDependencies>
<updatePomFile>true</updatePomFile>
<flattenMode>resolveCiFriendliesOnly</flattenMode>
</configuration>
<executions>
<execution>
<id>flatten</id>
<phase>process-resources</phase>
<goals>
<goal>flatten</goal>
</goals>
</execution>
<execution>
<id>flatten.clean</id>
<phase>clean</phase>
<goals>
<goal>clean</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>

2
service-api/pom.xml
View File

@ -12,7 +12,7 @@
<parent>
<groupId>me.chyxion.tigon</groupId>
<artifactId>tigon</artifactId>
<version>0.0.4-SNAPSHOT</version>
<version>${revision}</version>
</parent>
<dependencies>

2
service-support/pom.xml
View File

@ -12,7 +12,7 @@
<parent>
<groupId>me.chyxion.tigon</groupId>
<artifactId>tigon</artifactId>
<version>0.0.4-SNAPSHOT</version>
<version>${revision}</version>
</parent>
<dependencies>

33
set-version.sh
View File

@ -1,33 +0,0 @@
#!/bin/bash
# get real path of softlink
get_real_path() {
local f="$1"
while [ -h "$f" ]; do
ls=`ls -ld "$f"`
link=`expr "$ls" : '.*-> \(.*\)$'`
if expr "$link" : '/.*' > /dev/null; then
f="$link"
else
f=`dirname "$f"`/"$link"
fi
done
echo "$f"
}
prg_path=$(get_real_path "$0")
echo "Script path [$prg_path]"
# Service Home
pushd $(dirname "$prg_path") > /dev/null
WORK_DIR=$(pwd)
echo "Work dir [$WORK_DIR]"
if [[ ! -z "$1" ]] ; then
mvn versions:set -DgenerateBackupPoms=false -DnewVersion=$1
else
echo 'version is required'
exit 1
fi
popd > /dev/null

2
shiro-cas/pom.xml
View File

@ -12,7 +12,7 @@
<parent>
<groupId>me.chyxion.tigon</groupId>
<artifactId>tigon</artifactId>
<version>0.0.4-SNAPSHOT</version>
<version>${revision}</version>
</parent>
<dependencies>

2
shiro-core/pom.xml
View File

@ -12,7 +12,7 @@
<parent>
<groupId>me.chyxion.tigon</groupId>
<artifactId>tigon</artifactId>
<version>0.0.4-SNAPSHOT</version>
<version>${revision}</version>
</parent>
<dependencies>

2
shiro/pom.xml
View File

@ -12,7 +12,7 @@
<parent>
<groupId>me.chyxion.tigon</groupId>
<artifactId>tigon</artifactId>
<version>0.0.4-SNAPSHOT</version>
<version>${revision}</version>
</parent>
<dependencies>

2
web-controller/pom.xml
View File

@ -12,7 +12,7 @@
<parent>
<groupId>me.chyxion.tigon</groupId>
<artifactId>tigon</artifactId>
<version>0.0.4-SNAPSHOT</version>
<version>${revision}</version>
</parent>
<dependencies>

12
web-controller/src/test/java/me/chyxion/tigon/web/controller/CustomController.java
View File

@ -14,15 +14,15 @@ import org.springframework.web.bind.annotation.RequestMapping;
* @author Donghuang
* @date Sep 11, 2019 14:46:56
*/
@ListApi(searchCols = {Customer.ACCOUNT, Customer.NAME},
@ListApi(searchCols = {Customer.Fields.account, Customer.Fields.name},
filterCols = {
@FilterCol(param = Customer.NAME, type = String.class),
@FilterCol(param = Customer.ACCOUNT, type = String.class),
@FilterCol(param = Customer.GENDER, type = String.class)
@FilterCol(param = Customer.Fields.name, type = String.class),
@FilterCol(param = Customer.Fields.account, type = String.class),
@FilterCol(param = Customer.Fields.gender, type = String.class)
},
orderCols = {
@OrderCol(Customer.NAME),
@OrderCol(Customer.ACCOUNT)
@OrderCol(Customer.Fields.name),
@OrderCol(Customer.Fields.account)
})
@Controller
@RequestMapping("/customer")

10
web-controller/src/test/java/me/chyxion/tigon/web/controller/TestDriver.java
View File

@ -43,16 +43,16 @@ public class TestDriver {
params.put("limit", "20");
params.put("search", "FooBar");
final Map<String, String> orders = new HashMap<>();
orders.put(Customer.ACCOUNT, "desc");
orders.put(Customer.NAME, "asc");
orders.put(Customer.Fields.account, "desc");
orders.put(Customer.Fields.name, "asc");
params.put("orders", objectMapper.writeValueAsString(orders));
final Map<String, Object> filters = new HashMap<>();
filters.put(Customer.NAME, "Donghuang");
filters.put(Customer.ACCOUNT, Arrays.asList("Donghuang", "Bingpo"));
filters.put(Customer.Fields.name, "Donghuang");
filters.put(Customer.Fields.account, Arrays.asList("Donghuang", "Bingpo"));
final Map<String, Object> genderParam = new HashMap<>();
genderParam.put("op", "gt");
genderParam.put("val", "20");
filters.put(Customer.GENDER, genderParam);
filters.put(Customer.Fields.gender, genderParam);
params.put("filters", objectMapper.writeValueAsString(filters));
t.print(t.get("/customer/list", params));
}

2
web-controller/src/test/java/me/chyxion/tigon/web/model/Customer.java
View File

@ -11,7 +11,7 @@ import lombok.experimental.FieldNameConstants;
*/
@Getter
@Setter
@FieldNameConstants(prefix = "")
@FieldNameConstants
public class Customer extends M0<Long> {
private String account;
private String name;

2
web/pom.xml
View File

@ -13,7 +13,7 @@
<parent>
<groupId>me.chyxion.tigon</groupId>
<artifactId>tigon</artifactId>
<version>0.0.4-SNAPSHOT</version>
<version>${revision}</version>
</parent>
<dependencies>