Skip to content

T
test
Commit 238b2715 authored by 雍欢's avatar 雍欢
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents 76a5796b 2ae7790c
Hide whitespace changes
Inline Side-by-side
Showing with 13903 additions and 15 deletions
db/createdb.sql 0 → 100644
View file @ 238b2715
This source diff could not be displayed because it is too large. You can view the blob instead.
db/init_data.sql 0 → 100644
View file @ 238b2715
This source diff could not be displayed because it is too large. You can view the blob instead.
huigou-common/pom.xml
View file @ 238b2715
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<parent> <parent>
<groupId>com.huigou</groupId> <groupId>com.huigou</groupId>
<artifactId>root</artifactId> <artifactId>root</artifactId>
<version>1.1.2-SNAPSHOT</version> <version>1.1.3-SNAPSHOT</version>
</parent> </parent>
<artifactId>huigou-common</artifactId> <artifactId>huigou-common</artifactId>
<name>huigou-common</name> <name>huigou-common</name>
......
huigou-core-api/pom.xml
View file @ 238b2715
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<parent> <parent>
<groupId>com.huigou</groupId> <groupId>com.huigou</groupId>
<artifactId>root</artifactId> <artifactId>root</artifactId>
<version>1.1.2-SNAPSHOT</version> <version>1.1.3-SNAPSHOT</version>
</parent> </parent>
<artifactId>huigou-core-api</artifactId> <artifactId>huigou-core-api</artifactId>
<name>huigou-core-api</name> <name>huigou-core-api</name>
......
huigou-core-impl/pom.xml
View file @ 238b2715
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<parent> <parent>
<groupId>com.huigou</groupId> <groupId>com.huigou</groupId>
<artifactId>root</artifactId> <artifactId>root</artifactId>
<version>1.1.2-SNAPSHOT</version> <version>1.1.3-SNAPSHOT</version>
</parent> </parent>
<artifactId>huigou-core-impl</artifactId> <artifactId>huigou-core-impl</artifactId>
<name>huigou-core-impl</name> <name>huigou-core-impl</name>
......
huigou-core-proxy/pom.xml
View file @ 238b2715
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<parent> <parent>
<groupId>com.huigou</groupId> <groupId>com.huigou</groupId>
<artifactId>root</artifactId> <artifactId>root</artifactId>
<version>1.1.2-SNAPSHOT</version> <version>1.1.3-SNAPSHOT</version>
</parent> </parent>
<artifactId>huigou-core-proxy</artifactId> <artifactId>huigou-core-proxy</artifactId>
<name>huigou-core-proxy</name> <name>huigou-core-proxy</name>
......
huigou-data/pom.xml
View file @ 238b2715
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<parent> <parent>
<groupId>com.huigou</groupId> <groupId>com.huigou</groupId>
<artifactId>root</artifactId> <artifactId>root</artifactId>
<version>1.1.2-SNAPSHOT</version> <version>1.1.3-SNAPSHOT</version>
</parent> </parent>
<artifactId>huigou-data</artifactId> <artifactId>huigou-data</artifactId>
<name>huigou-data</name> <name>huigou-data</name>
......
huigou-data/src/main/java/com/huigou/data/cache/SpringAdaptingCache.java
View file @ 238b2715
package com.huigou.data.cache; package com.huigou.data.cache;
import java.io.Serializable; import java.io.Serializable;
import java.util.concurrent.Callable;
import org.springframework.cache.Cache; import org.springframework.cache.Cache;
import org.springframework.cache.support.SimpleValueWrapper; import org.springframework.cache.support.SimpleValueWrapper;
...@@ -11,7 +12,7 @@ import com.huigou.util.Md5Builder; ...@@ -11,7 +12,7 @@ import com.huigou.util.Md5Builder;
/** /**
* Spring 缓存适配系统已有缓存体系 * Spring 缓存适配系统已有缓存体系
* *
* @author xx * @author xx
*/ */
public class SpringAdaptingCache implements Cache { public class SpringAdaptingCache implements Cache {
...@@ -60,6 +61,11 @@ public class SpringAdaptingCache implements Cache { ...@@ -60,6 +61,11 @@ public class SpringAdaptingCache implements Cache {
return iCache.get(cacheKey, type); return iCache.get(cacheKey, type);
} }
@Override
public <T> T get(Object key, Callable<T> callable) {
throw new UnsupportedOperationException("");
}
@Override @Override
public void put(Object key, Object value) { public void put(Object key, Object value) {
String cacheKey = this.getCacheKey(key); String cacheKey = this.getCacheKey(key);
......
huigou-loader/pom.xml
View file @ 238b2715
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<parent> <parent>
<groupId>com.huigou</groupId> <groupId>com.huigou</groupId>
<artifactId>root</artifactId> <artifactId>root</artifactId>
<version>1.1.2-SNAPSHOT</version> <version>1.1.3-SNAPSHOT</version>
</parent> </parent>
<artifactId>huigou-loader</artifactId> <artifactId>huigou-loader</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
......
huigou-system-common/pom.xml
View file @ 238b2715
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<parent> <parent>
<groupId>com.huigou</groupId> <groupId>com.huigou</groupId>
<artifactId>root</artifactId> <artifactId>root</artifactId>
<version>1.1.2-SNAPSHOT</version> <version>1.1.3-SNAPSHOT</version>
</parent> </parent>
<artifactId>huigou-system-common</artifactId> <artifactId>huigou-system-common</artifactId>
......
huigou-uasp/pom.xml
View file @ 238b2715
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<parent> <parent>
<groupId>com.huigou</groupId> <groupId>com.huigou</groupId>
<artifactId>root</artifactId> <artifactId>root</artifactId>
<version>1.1.2-SNAPSHOT</version> <version>1.1.3-SNAPSHOT</version>
</parent> </parent>
<artifactId>huigou-uasp</artifactId> <artifactId>huigou-uasp</artifactId>
<name>统一架构平台</name> <name>统一架构平台</name>
......
huigou-xt/pom.xml
View file @ 238b2715
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<parent> <parent>
<groupId>com.huigou</groupId> <groupId>com.huigou</groupId>
<artifactId>root</artifactId> <artifactId>root</artifactId>
<version>1.1.2-SNAPSHOT</version> <version>1.1.3-SNAPSHOT</version>
</parent> </parent>
<artifactId>huigou-xt</artifactId> <artifactId>huigou-xt</artifactId>
<name>统一应用支撑平台</name> <name>统一应用支撑平台</name>
......
pom.xml
View file @ 238b2715
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<groupId>com.huigou</groupId> <groupId>com.huigou</groupId>
<artifactId>root</artifactId> <artifactId>root</artifactId>
<version>1.1.2-SNAPSHOT</version> <version>1.1.3-SNAPSHOT</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<modules> <modules>
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
<json-lib.version>2.4</json-lib.version> <json-lib.version>2.4</json-lib.version>
<xom.version>1.2.5</xom.version> <xom.version>1.2.5</xom.version>
<spring.version>4.2.5.RELEASE</spring.version> <spring.version>4.3.9.RELEASE</spring.version>
<oracle.driver.version>11.2.0.1.0</oracle.driver.version> <oracle.driver.version>11.2.0.1.0</oracle.driver.version>
<sqlserver.driver.version>1.0</sqlserver.driver.version> <sqlserver.driver.version>1.0</sqlserver.driver.version>
<huigou.query.version>1.0.0</huigou.query.version> <huigou.query.version>1.0.0</huigou.query.version>
...@@ -158,7 +158,7 @@ ...@@ -158,7 +158,7 @@
<!-- test --> <!-- test -->
<junit.version>4.9</junit.version> <junit.version>4.9</junit.version>
<spring-data-mongodb.version>1.9.3.RELEASE</spring-data-mongodb.version> <spring-data-mongodb.version>1.9.3.RELEASE</spring-data-mongodb.version>
<huigou.uasp.version>1.1.2-SNAPSHOT</huigou.uasp.version> <huigou.uasp.version>1.1.3-SNAPSHOT</huigou.uasp.version>
</properties> </properties>
<dependencyManagement> <dependencyManagement>
...@@ -1430,7 +1430,7 @@ ...@@ -1430,7 +1430,7 @@
<dependency> <dependency>
<groupId>javax.servlet</groupId> <groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId> <artifactId>jstl</artifactId>
<version>1.1.2</version> <version>1.1.3-SNAPSHOT</version>
<exclusions> <exclusions>
<exclusion> <exclusion>
<groupId>*</groupId> <groupId>*</groupId>
...@@ -1741,7 +1741,7 @@ ...@@ -1741,7 +1741,7 @@
<dependency> <dependency>
<groupId>taglibs</groupId> <groupId>taglibs</groupId>
<artifactId>standard</artifactId> <artifactId>standard</artifactId>
<version>1.1.2</version> <version>1.1.3-SNAPSHOT</version>
<exclusions> <exclusions>
<exclusion> <exclusion>
<groupId>*</groupId> <groupId>*</groupId>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment