1.2.8-SNAPSHOT

huigou-common/.gitignore

@@ -6,4 +6,5 @@
 .tern-project
 *.iml
 /bin
-/lib
+/lib
\ No newline at end of file
+src/main/resource/rebel.xml
\ No newline at end of file

huigou-common/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.huigou</groupId>
 		<artifactId>root</artifactId>
-		<version>1.2.7</version>
+		<version>1.2.8-SNAPSHOT</version>
 	</parent>
 	<artifactId>huigou-common</artifactId>
 	<name>huigou-common</name>

huigou-core-api/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.huigou</groupId>
 		<artifactId>root</artifactId>
-		<version>1.2.7</version>
+		<version>1.2.8-SNAPSHOT</version>
 	</parent>
 	<artifactId>huigou-core-api</artifactId>
 	<name>huigou-core-api</name>

huigou-core-impl/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.huigou</groupId>
 		<artifactId>root</artifactId>
-		<version>1.2.7</version>
+		<version>1.2.8-SNAPSHOT</version>
 	</parent>
 	<artifactId>huigou-core-impl</artifactId>
 	<name>huigou-core-impl</name>

huigou-core-proxy/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.huigou</groupId>
 		<artifactId>root</artifactId>
-		<version>1.2.7</version>
+		<version>1.2.8-SNAPSHOT</version>
 	</parent>
 	<artifactId>huigou-core-proxy</artifactId>
 	<name>huigou-core-proxy</name>

huigou-data/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.huigou</groupId>
 		<artifactId>root</artifactId>
-		<version>1.2.7</version>
+		<version>1.2.8-SNAPSHOT</version>
 	</parent>
 	<artifactId>huigou-data</artifactId>
 	<name>huigou-data</name>

huigou-loader/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.huigou</groupId>
 		<artifactId>root</artifactId>
-		<version>1.2.7</version>
+		<version>1.2.8-SNAPSHOT</version>
 	</parent>
 	<artifactId>huigou-loader</artifactId>
 	<packaging>jar</packaging>

huigou-system-common/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.huigou</groupId>
 		<artifactId>root</artifactId>
-		<version>1.2.7</version>
+		<version>1.2.8-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>huigou-system-common</artifactId>

huigou-uasp/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.huigou</groupId>
         <artifactId>root</artifactId>
-        <version>1.2.7</version>
+        <version>1.2.8-SNAPSHOT</version>
     </parent>
     <artifactId>huigou-uasp</artifactId>
     <name>huigou-uasp</name>
@@ -348,7 +348,7 @@
         <dependency>
             <groupId>com.topsunit</groupId>
             <artifactId>query-spring</artifactId>
-            <version>1.2.7</version>
+            <version>1.2.8-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>net.sf.cssbox</groupId>

huigou-xt/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.huigou</groupId>
         <artifactId>root</artifactId>
-        <version>1.2.7</version>
+        <version>1.2.8-SNAPSHOT</version>
     </parent>
     <artifactId>huigou-xt</artifactId>
     <name>huigou-xt</name>

huigou-xt/src/main/resources/config/spring/spring-data.xml

@@ -33,4 +33,9 @@
 	<bean id="sqlBuilder" class="com.huigou.data.query.parser.impl.SQLBuilderImpl">
 		<property name="permissionBuilder" ref="queryPermissionBuilder" />
 	</bean>
+
+	<bean id="mapperScannerConfigurer" class="com.topsunit.query.spring.mapper.MapperScannerConfigurer">
+		<property name="basePackage" value="com.huigou.**.mapper"/>
+		<property name="sqlExecutorBeanName" value="sqlExecutorDao" />
+	</bean>
 </beans>
\ No newline at end of file

huigou-xt/src/main/resources/i18n/messages_en.properties

@@ -38,4 +38,5 @@ invalid.field.type=Type of invalid inspection field.
 unable.to.move.to={0} can't be moved to {1}.
 deptId.not.blank=Department ID can't be blank.
 proc.unit.id.not.blank=Process step ID can't be blank!
-proc.unit.handler.group.id.not.null=Process grouping  ID can't be blank!
+proc.unit.handler.group.id.not.null=Process grouping  ID can't be blank!
\ No newline at end of file
+roleId.not.blank=Parameter roleId can't be blank!
\ No newline at end of file

huigou-xt/src/main/resources/i18n/messages_zh.properties

@@ -38,4 +38,5 @@ invalid.field.type=无效的检查字段类型。
 unable.to.move.to={0}无法移动到{1}。
 deptId.not.blank=部门ID不能为空。
 proc.unit.id.not.blank=流程环节id不能为空！
-proc.unit.handler.group.id.not.null=流程分组id不能为空！
+proc.unit.handler.group.id.not.null=流程分组id不能为空！
\ No newline at end of file
+roleId.not.blank=参数 roleId 不能为空。
\ No newline at end of file

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.huigou</groupId>
     <artifactId>root</artifactId>
-    <version>1.2.7</version>
+    <version>1.2.8-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <modules>
@@ -158,7 +158,7 @@
         <!-- test -->
         <junit.version>4.13</junit.version>
         <spring-data-mongodb.version>1.9.3.RELEASE</spring-data-mongodb.version>
-        <huigou.uasp.version>1.2.7</huigou.uasp.version>
+        <huigou.uasp.version>1.2.8-SNAPSHOT</huigou.uasp.version>
          <classgraph.version>4.8.43</classgraph.version>
          <fastjson.version>1.2.59</fastjson.version>
         <jstyleparser.version>3.5</jstyleparser.version>
@@ -1940,6 +1940,11 @@
                   <artifactId>spring-test</artifactId>
                   <version>${spring.version}</version>
              </dependency>
+            <dependency>
+			    <groupId>com.topsunit</groupId>
+			    <artifactId>query-spring</artifactId>
+                <version>${huigou.uasp.version}</version>
+		    </dependency>
         </dependencies>
     </dependencyManagement>
     <distributionManagement>

query-spring/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.huigou</groupId>
         <artifactId>root</artifactId>
-        <version>1.2.7</version>
+        <version>1.2.8-SNAPSHOT</version>
     </parent>
 
     <groupId>com.topsunit</groupId>