diff --git a/casic-iris-acs/pom.xml b/casic-iris-acs/pom.xml
index c13d0cf..173a3ef 100644
--- a/casic-iris-acs/pom.xml
+++ b/casic-iris-acs/pom.xml
@@ -10,7 +10,6 @@
casic-iris-acs
- ${pro.version}
jar
casic-iris-acs
虹膜门禁系统 Access Control System
@@ -20,39 +19,42 @@
com.casic
casic-core
- ${casic.version}
+ ${core.version}
com.casic
casic-admin-support
- ${casic.version}
-
-
- com.casic
- casic-export-support
- 1.0.0-SNAPSHOT
+ ${admin.version}
com.casic
casic-expands-office
- 1.0.0-SNAPSHOT
+ provided
+ ${office.version}
com.casic
casic-admin-support
- ${casic.version}
-
-
- com.casic
- casic-iris-support
- ${casic.version}
+ ${admin.version}
com.casic
casic-iris-device
- ${casic.version}
+ provided
+ ${pro.version}
+
+
+ com.casic
+ casic-iris-support
+ ${pro.version}
+
+
+ com.casic
+ casic-export-support
+ ${admin.version}
+ compile
diff --git a/casic-iris-acs/pom.xml b/casic-iris-acs/pom.xml
index c13d0cf..173a3ef 100644
--- a/casic-iris-acs/pom.xml
+++ b/casic-iris-acs/pom.xml
@@ -10,7 +10,6 @@
casic-iris-acs
- ${pro.version}
jar
casic-iris-acs
虹膜门禁系统 Access Control System
@@ -20,39 +19,42 @@
com.casic
casic-core
- ${casic.version}
+ ${core.version}
com.casic
casic-admin-support
- ${casic.version}
-
-
- com.casic
- casic-export-support
- 1.0.0-SNAPSHOT
+ ${admin.version}
com.casic
casic-expands-office
- 1.0.0-SNAPSHOT
+ provided
+ ${office.version}
com.casic
casic-admin-support
- ${casic.version}
-
-
- com.casic
- casic-iris-support
- ${casic.version}
+ ${admin.version}
com.casic
casic-iris-device
- ${casic.version}
+ provided
+ ${pro.version}
+
+
+ com.casic
+ casic-iris-support
+ ${pro.version}
+
+
+ com.casic
+ casic-export-support
+ ${admin.version}
+ compile
diff --git a/casic-iris-atd/pom.xml b/casic-iris-atd/pom.xml
index 511129e..fc075a6 100644
--- a/casic-iris-atd/pom.xml
+++ b/casic-iris-atd/pom.xml
@@ -8,9 +8,7 @@
1.0.0-SNAPSHOT
../pom.xml
-
casic-iris-atd
- ${pro.version}
jar
casic-iris-atd
虹膜考勤系统 Attendance System
@@ -20,39 +18,39 @@
com.casic
casic-core
- ${casic.version}
+ ${core.version}
com.casic
casic-expands-office
- 1.0.0-SNAPSHOT
+ ${office.version}
com.casic
casic-export-support
- 1.0.0-SNAPSHOT
+ ${admin.version}
com.casic
casic-iris-support
- ${casic.version}
+ ${pro.version}
com.casic
casic-metadata-support
- ${casic.version}
+ ${extension.version}
com.casic
casic-export-support
- ${casic.version}
+ ${admin.version}
com.casic
casic-file-support
- ${casic.version}
+ ${extension.version}
diff --git a/casic-iris-acs/pom.xml b/casic-iris-acs/pom.xml
index c13d0cf..173a3ef 100644
--- a/casic-iris-acs/pom.xml
+++ b/casic-iris-acs/pom.xml
@@ -10,7 +10,6 @@
casic-iris-acs
- ${pro.version}
jar
casic-iris-acs
虹膜门禁系统 Access Control System
@@ -20,39 +19,42 @@
com.casic
casic-core
- ${casic.version}
+ ${core.version}
com.casic
casic-admin-support
- ${casic.version}
-
-
- com.casic
- casic-export-support
- 1.0.0-SNAPSHOT
+ ${admin.version}
com.casic
casic-expands-office
- 1.0.0-SNAPSHOT
+ provided
+ ${office.version}
com.casic
casic-admin-support
- ${casic.version}
-
-
- com.casic
- casic-iris-support
- ${casic.version}
+ ${admin.version}
com.casic
casic-iris-device
- ${casic.version}
+ provided
+ ${pro.version}
+
+
+ com.casic
+ casic-iris-support
+ ${pro.version}
+
+
+ com.casic
+ casic-export-support
+ ${admin.version}
+ compile
diff --git a/casic-iris-atd/pom.xml b/casic-iris-atd/pom.xml
index 511129e..fc075a6 100644
--- a/casic-iris-atd/pom.xml
+++ b/casic-iris-atd/pom.xml
@@ -8,9 +8,7 @@
1.0.0-SNAPSHOT
../pom.xml
-
casic-iris-atd
- ${pro.version}
jar
casic-iris-atd
虹膜考勤系统 Attendance System
@@ -20,39 +18,39 @@
com.casic
casic-core
- ${casic.version}
+ ${core.version}
com.casic
casic-expands-office
- 1.0.0-SNAPSHOT
+ ${office.version}
com.casic
casic-export-support
- 1.0.0-SNAPSHOT
+ ${admin.version}
com.casic
casic-iris-support
- ${casic.version}
+ ${pro.version}
com.casic
casic-metadata-support
- ${casic.version}
+ ${extension.version}
com.casic
casic-export-support
- ${casic.version}
+ ${admin.version}
com.casic
casic-file-support
- ${casic.version}
+ ${extension.version}
diff --git a/casic-iris-device/pom.xml b/casic-iris-device/pom.xml
index 60207ce..e2c1c35 100644
--- a/casic-iris-device/pom.xml
+++ b/casic-iris-device/pom.xml
@@ -10,7 +10,6 @@
casic-iris-device
- ${pro.version}
jar
casic-iris-device
设备管理
@@ -21,14 +20,14 @@
com.casic
casic-core
- ${casic.version}
+ ${core.version}
com.casic
casic-iris-support
- ${casic.version}
+ ${pro.version}
diff --git a/casic-iris-acs/pom.xml b/casic-iris-acs/pom.xml
index c13d0cf..173a3ef 100644
--- a/casic-iris-acs/pom.xml
+++ b/casic-iris-acs/pom.xml
@@ -10,7 +10,6 @@
casic-iris-acs
- ${pro.version}
jar
casic-iris-acs
虹膜门禁系统 Access Control System
@@ -20,39 +19,42 @@
com.casic
casic-core
- ${casic.version}
+ ${core.version}
com.casic
casic-admin-support
- ${casic.version}
-
-
- com.casic
- casic-export-support
- 1.0.0-SNAPSHOT
+ ${admin.version}
com.casic
casic-expands-office
- 1.0.0-SNAPSHOT
+ provided
+ ${office.version}
com.casic
casic-admin-support
- ${casic.version}
-
-
- com.casic
- casic-iris-support
- ${casic.version}
+ ${admin.version}
com.casic
casic-iris-device
- ${casic.version}
+ provided
+ ${pro.version}
+
+
+ com.casic
+ casic-iris-support
+ ${pro.version}
+
+
+ com.casic
+ casic-export-support
+ ${admin.version}
+ compile
diff --git a/casic-iris-atd/pom.xml b/casic-iris-atd/pom.xml
index 511129e..fc075a6 100644
--- a/casic-iris-atd/pom.xml
+++ b/casic-iris-atd/pom.xml
@@ -8,9 +8,7 @@
1.0.0-SNAPSHOT
../pom.xml
-
casic-iris-atd
- ${pro.version}
jar
casic-iris-atd
虹膜考勤系统 Attendance System
@@ -20,39 +18,39 @@
com.casic
casic-core
- ${casic.version}
+ ${core.version}
com.casic
casic-expands-office
- 1.0.0-SNAPSHOT
+ ${office.version}
com.casic
casic-export-support
- 1.0.0-SNAPSHOT
+ ${admin.version}
com.casic
casic-iris-support
- ${casic.version}
+ ${pro.version}
com.casic
casic-metadata-support
- ${casic.version}
+ ${extension.version}
com.casic
casic-export-support
- ${casic.version}
+ ${admin.version}
com.casic
casic-file-support
- ${casic.version}
+ ${extension.version}
diff --git a/casic-iris-device/pom.xml b/casic-iris-device/pom.xml
index 60207ce..e2c1c35 100644
--- a/casic-iris-device/pom.xml
+++ b/casic-iris-device/pom.xml
@@ -10,7 +10,6 @@
casic-iris-device
- ${pro.version}
jar
casic-iris-device
设备管理
@@ -21,14 +20,14 @@
com.casic
casic-core
- ${casic.version}
+ ${core.version}
com.casic
casic-iris-support
- ${casic.version}
+ ${pro.version}
diff --git a/casic-iris-register/pom.xml b/casic-iris-register/pom.xml
index 007d778..a265222 100644
--- a/casic-iris-register/pom.xml
+++ b/casic-iris-register/pom.xml
@@ -10,7 +10,6 @@
casic-iris-register
- ${pro.version}
jar
casic-iris-register
虹膜注册
@@ -21,28 +20,28 @@
com.casic
casic-core
- ${casic.version}
+ ${core.version}
com.casic
casic-iris-support
- ${casic.version}
+ ${pro.version}
com.casic
casic-metadata-support
- ${casic.version}
+ ${extension.version}
com.casic
casic-export-support
- ${casic.version}
+ ${admin.version}
com.casic
casic-file-support
- ${casic.version}
+ ${extension.version}
diff --git a/casic-iris-acs/pom.xml b/casic-iris-acs/pom.xml
index c13d0cf..173a3ef 100644
--- a/casic-iris-acs/pom.xml
+++ b/casic-iris-acs/pom.xml
@@ -10,7 +10,6 @@
casic-iris-acs
- ${pro.version}
jar
casic-iris-acs
虹膜门禁系统 Access Control System
@@ -20,39 +19,42 @@
com.casic
casic-core
- ${casic.version}
+ ${core.version}
com.casic
casic-admin-support
- ${casic.version}
-
-
- com.casic
- casic-export-support
- 1.0.0-SNAPSHOT
+ ${admin.version}
com.casic
casic-expands-office
- 1.0.0-SNAPSHOT
+ provided
+ ${office.version}
com.casic
casic-admin-support
- ${casic.version}
-
-
- com.casic
- casic-iris-support
- ${casic.version}
+ ${admin.version}
com.casic
casic-iris-device
- ${casic.version}
+ provided
+ ${pro.version}
+
+
+ com.casic
+ casic-iris-support
+ ${pro.version}
+
+
+ com.casic
+ casic-export-support
+ ${admin.version}
+ compile
diff --git a/casic-iris-atd/pom.xml b/casic-iris-atd/pom.xml
index 511129e..fc075a6 100644
--- a/casic-iris-atd/pom.xml
+++ b/casic-iris-atd/pom.xml
@@ -8,9 +8,7 @@
1.0.0-SNAPSHOT
../pom.xml
-
casic-iris-atd
- ${pro.version}
jar
casic-iris-atd
虹膜考勤系统 Attendance System
@@ -20,39 +18,39 @@
com.casic
casic-core
- ${casic.version}
+ ${core.version}
com.casic
casic-expands-office
- 1.0.0-SNAPSHOT
+ ${office.version}
com.casic
casic-export-support
- 1.0.0-SNAPSHOT
+ ${admin.version}
com.casic
casic-iris-support
- ${casic.version}
+ ${pro.version}
com.casic
casic-metadata-support
- ${casic.version}
+ ${extension.version}
com.casic
casic-export-support
- ${casic.version}
+ ${admin.version}
com.casic
casic-file-support
- ${casic.version}
+ ${extension.version}
diff --git a/casic-iris-device/pom.xml b/casic-iris-device/pom.xml
index 60207ce..e2c1c35 100644
--- a/casic-iris-device/pom.xml
+++ b/casic-iris-device/pom.xml
@@ -10,7 +10,6 @@
casic-iris-device
- ${pro.version}
jar
casic-iris-device
设备管理
@@ -21,14 +20,14 @@
com.casic
casic-core
- ${casic.version}
+ ${core.version}
com.casic
casic-iris-support
- ${casic.version}
+ ${pro.version}
diff --git a/casic-iris-register/pom.xml b/casic-iris-register/pom.xml
index 007d778..a265222 100644
--- a/casic-iris-register/pom.xml
+++ b/casic-iris-register/pom.xml
@@ -10,7 +10,6 @@
casic-iris-register
- ${pro.version}
jar
casic-iris-register
虹膜注册
@@ -21,28 +20,28 @@
com.casic
casic-core
- ${casic.version}
+ ${core.version}
com.casic
casic-iris-support
- ${casic.version}
+ ${pro.version}
com.casic
casic-metadata-support
- ${casic.version}
+ ${extension.version}
com.casic
casic-export-support
- ${casic.version}
+ ${admin.version}
com.casic
casic-file-support
- ${casic.version}
+ ${extension.version}
diff --git a/casic-iris-support/pom.xml b/casic-iris-support/pom.xml
index 5732dfd..0796b62 100644
--- a/casic-iris-support/pom.xml
+++ b/casic-iris-support/pom.xml
@@ -20,13 +20,13 @@
com.casic
casic-core
- ${casic.version}
+ ${core.version}
com.casic
casic-admin-support
- ${casic.version}
+ ${admin.version}
diff --git a/casic-iris-acs/pom.xml b/casic-iris-acs/pom.xml
index c13d0cf..173a3ef 100644
--- a/casic-iris-acs/pom.xml
+++ b/casic-iris-acs/pom.xml
@@ -10,7 +10,6 @@
casic-iris-acs
- ${pro.version}
jar
casic-iris-acs
虹膜门禁系统 Access Control System
@@ -20,39 +19,42 @@
com.casic
casic-core
- ${casic.version}
+ ${core.version}
com.casic
casic-admin-support
- ${casic.version}
-
-
- com.casic
- casic-export-support
- 1.0.0-SNAPSHOT
+ ${admin.version}
com.casic
casic-expands-office
- 1.0.0-SNAPSHOT
+ provided
+ ${office.version}
com.casic
casic-admin-support
- ${casic.version}
-
-
- com.casic
- casic-iris-support
- ${casic.version}
+ ${admin.version}
com.casic
casic-iris-device
- ${casic.version}
+ provided
+ ${pro.version}
+
+
+ com.casic
+ casic-iris-support
+ ${pro.version}
+
+
+ com.casic
+ casic-export-support
+ ${admin.version}
+ compile
diff --git a/casic-iris-atd/pom.xml b/casic-iris-atd/pom.xml
index 511129e..fc075a6 100644
--- a/casic-iris-atd/pom.xml
+++ b/casic-iris-atd/pom.xml
@@ -8,9 +8,7 @@
1.0.0-SNAPSHOT
../pom.xml
-
casic-iris-atd
- ${pro.version}
jar
casic-iris-atd
虹膜考勤系统 Attendance System
@@ -20,39 +18,39 @@
com.casic
casic-core
- ${casic.version}
+ ${core.version}
com.casic
casic-expands-office
- 1.0.0-SNAPSHOT
+ ${office.version}
com.casic
casic-export-support
- 1.0.0-SNAPSHOT
+ ${admin.version}
com.casic
casic-iris-support
- ${casic.version}
+ ${pro.version}
com.casic
casic-metadata-support
- ${casic.version}
+ ${extension.version}
com.casic
casic-export-support
- ${casic.version}
+ ${admin.version}
com.casic
casic-file-support
- ${casic.version}
+ ${extension.version}
diff --git a/casic-iris-device/pom.xml b/casic-iris-device/pom.xml
index 60207ce..e2c1c35 100644
--- a/casic-iris-device/pom.xml
+++ b/casic-iris-device/pom.xml
@@ -10,7 +10,6 @@
casic-iris-device
- ${pro.version}
jar
casic-iris-device
设备管理
@@ -21,14 +20,14 @@
com.casic
casic-core
- ${casic.version}
+ ${core.version}
com.casic
casic-iris-support
- ${casic.version}
+ ${pro.version}
diff --git a/casic-iris-register/pom.xml b/casic-iris-register/pom.xml
index 007d778..a265222 100644
--- a/casic-iris-register/pom.xml
+++ b/casic-iris-register/pom.xml
@@ -10,7 +10,6 @@
casic-iris-register
- ${pro.version}
jar
casic-iris-register
虹膜注册
@@ -21,28 +20,28 @@
com.casic
casic-core
- ${casic.version}
+ ${core.version}
com.casic
casic-iris-support
- ${casic.version}
+ ${pro.version}
com.casic
casic-metadata-support
- ${casic.version}
+ ${extension.version}
com.casic
casic-export-support
- ${casic.version}
+ ${admin.version}
com.casic
casic-file-support
- ${casic.version}
+ ${extension.version}
diff --git a/casic-iris-support/pom.xml b/casic-iris-support/pom.xml
index 5732dfd..0796b62 100644
--- a/casic-iris-support/pom.xml
+++ b/casic-iris-support/pom.xml
@@ -20,13 +20,13 @@
com.casic
casic-core
- ${casic.version}
+ ${core.version}
com.casic
casic-admin-support
- ${casic.version}
+ ${admin.version}
diff --git a/casic-web/pom.xml b/casic-web/pom.xml
index 71b3a85..bb2c35c 100644
--- a/casic-web/pom.xml
+++ b/casic-web/pom.xml
@@ -59,49 +59,60 @@
com.casic
casic-core
- ${casic.version}
+ ${core.version}
com.casic
casic-admin-support
- ${casic.version}
+ ${admin.version}
com.casic
casic-admin-core
- ${casic.version}
+ ${admin.version}
com.casic
casic-admin-area
- ${casic.version}
+ ${admin.version}
com.casic
casic-admin-init
- ${casic.version}
-
-
- com.casic
- casic-metadata-core
- ${casic.version}
+ ${admin.version}
com.casic
casic-export-support
- 1.0.0-SNAPSHOT
+ ${admin.version}
+
+
+ com.casic
+ casic-metadata-core
+ ${extension.version}
+
+
+ com.casic
+ casic-expands-office
+ ${office.version}
+
+
+ com.casic
+ casic-export-support
+ ${admin.version}
com.casic
casic-admin-export
- ${casic.version}
+ ${admin.version}
com.casic
casic-file
- ${casic.version}
+ ${extension.version}
+
com.casic
casic-iris-support
@@ -207,6 +218,13 @@
true
true
+
+
+
+ repackage
+
+
+
maven-assembly-plugin
diff --git a/casic-iris-acs/pom.xml b/casic-iris-acs/pom.xml
index c13d0cf..173a3ef 100644
--- a/casic-iris-acs/pom.xml
+++ b/casic-iris-acs/pom.xml
@@ -10,7 +10,6 @@
casic-iris-acs
- ${pro.version}
jar
casic-iris-acs
虹膜门禁系统 Access Control System
@@ -20,39 +19,42 @@
com.casic
casic-core
- ${casic.version}
+ ${core.version}
com.casic
casic-admin-support
- ${casic.version}
-
-
- com.casic
- casic-export-support
- 1.0.0-SNAPSHOT
+ ${admin.version}
com.casic
casic-expands-office
- 1.0.0-SNAPSHOT
+ provided
+ ${office.version}
com.casic
casic-admin-support
- ${casic.version}
-
-
- com.casic
- casic-iris-support
- ${casic.version}
+ ${admin.version}
com.casic
casic-iris-device
- ${casic.version}
+ provided
+ ${pro.version}
+
+
+ com.casic
+ casic-iris-support
+ ${pro.version}
+
+
+ com.casic
+ casic-export-support
+ ${admin.version}
+ compile
diff --git a/casic-iris-atd/pom.xml b/casic-iris-atd/pom.xml
index 511129e..fc075a6 100644
--- a/casic-iris-atd/pom.xml
+++ b/casic-iris-atd/pom.xml
@@ -8,9 +8,7 @@
1.0.0-SNAPSHOT
../pom.xml
-
casic-iris-atd
- ${pro.version}
jar
casic-iris-atd
虹膜考勤系统 Attendance System
@@ -20,39 +18,39 @@
com.casic
casic-core
- ${casic.version}
+ ${core.version}
com.casic
casic-expands-office
- 1.0.0-SNAPSHOT
+ ${office.version}
com.casic
casic-export-support
- 1.0.0-SNAPSHOT
+ ${admin.version}
com.casic
casic-iris-support
- ${casic.version}
+ ${pro.version}
com.casic
casic-metadata-support
- ${casic.version}
+ ${extension.version}
com.casic
casic-export-support
- ${casic.version}
+ ${admin.version}
com.casic
casic-file-support
- ${casic.version}
+ ${extension.version}
diff --git a/casic-iris-device/pom.xml b/casic-iris-device/pom.xml
index 60207ce..e2c1c35 100644
--- a/casic-iris-device/pom.xml
+++ b/casic-iris-device/pom.xml
@@ -10,7 +10,6 @@
casic-iris-device
- ${pro.version}
jar
casic-iris-device
设备管理
@@ -21,14 +20,14 @@
com.casic
casic-core
- ${casic.version}
+ ${core.version}
com.casic
casic-iris-support
- ${casic.version}
+ ${pro.version}
diff --git a/casic-iris-register/pom.xml b/casic-iris-register/pom.xml
index 007d778..a265222 100644
--- a/casic-iris-register/pom.xml
+++ b/casic-iris-register/pom.xml
@@ -10,7 +10,6 @@
casic-iris-register
- ${pro.version}
jar
casic-iris-register
虹膜注册
@@ -21,28 +20,28 @@
com.casic
casic-core
- ${casic.version}
+ ${core.version}
com.casic
casic-iris-support
- ${casic.version}
+ ${pro.version}
com.casic
casic-metadata-support
- ${casic.version}
+ ${extension.version}
com.casic
casic-export-support
- ${casic.version}
+ ${admin.version}
com.casic
casic-file-support
- ${casic.version}
+ ${extension.version}
diff --git a/casic-iris-support/pom.xml b/casic-iris-support/pom.xml
index 5732dfd..0796b62 100644
--- a/casic-iris-support/pom.xml
+++ b/casic-iris-support/pom.xml
@@ -20,13 +20,13 @@
com.casic
casic-core
- ${casic.version}
+ ${core.version}
com.casic
casic-admin-support
- ${casic.version}
+ ${admin.version}
diff --git a/casic-web/pom.xml b/casic-web/pom.xml
index 71b3a85..bb2c35c 100644
--- a/casic-web/pom.xml
+++ b/casic-web/pom.xml
@@ -59,49 +59,60 @@
com.casic
casic-core
- ${casic.version}
+ ${core.version}
com.casic
casic-admin-support
- ${casic.version}
+ ${admin.version}
com.casic
casic-admin-core
- ${casic.version}
+ ${admin.version}
com.casic
casic-admin-area
- ${casic.version}
+ ${admin.version}
com.casic
casic-admin-init
- ${casic.version}
-
-
- com.casic
- casic-metadata-core
- ${casic.version}
+ ${admin.version}
com.casic
casic-export-support
- 1.0.0-SNAPSHOT
+ ${admin.version}
+
+
+ com.casic
+ casic-metadata-core
+ ${extension.version}
+
+
+ com.casic
+ casic-expands-office
+ ${office.version}
+
+
+ com.casic
+ casic-export-support
+ ${admin.version}
com.casic
casic-admin-export
- ${casic.version}
+ ${admin.version}
com.casic
casic-file
- ${casic.version}
+ ${extension.version}
+
com.casic
casic-iris-support
@@ -207,6 +218,13 @@
true
true
+
+
+
+ repackage
+
+
+
maven-assembly-plugin
diff --git a/casic-web/src/main/resources/application.yml b/casic-web/src/main/resources/application.yml
deleted file mode 100644
index c80502c..0000000
--- a/casic-web/src/main/resources/application.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-##########################################################
-################## 所有profile共有的配置 #################
-##########################################################
-spring:
- profiles:
- active: @activatedProperties@
- datasource:
- driver-class-name: com.mysql.jdbc.Driver
- jms:
- pub-sub-domain: true
- aop:
- proxy-target-class: true #false为启用jdk默认动态代理,true为cglib动态代理
-################### mybatis-plus配置 ###################
-################### guns配置 ###################
-casic:
- kaptcha-open: true #是否开启登录时验证码 (true/false)
- nologin-urls: /user/login,/kaptcha,/config/baseConfig
-mybatis-plus:
- global-config:
- sql-injector: com.casic.missiles.modular.metadata.inject.MetaSqlInject
-
-server:
- tomcat:
- max-http-post-size: -1
\ No newline at end of file
diff --git a/casic-iris-acs/pom.xml b/casic-iris-acs/pom.xml
index c13d0cf..173a3ef 100644
--- a/casic-iris-acs/pom.xml
+++ b/casic-iris-acs/pom.xml
@@ -10,7 +10,6 @@
casic-iris-acs
- ${pro.version}
jar
casic-iris-acs
虹膜门禁系统 Access Control System
@@ -20,39 +19,42 @@
com.casic
casic-core
- ${casic.version}
+ ${core.version}
com.casic
casic-admin-support
- ${casic.version}
-
-
- com.casic
- casic-export-support
- 1.0.0-SNAPSHOT
+ ${admin.version}
com.casic
casic-expands-office
- 1.0.0-SNAPSHOT
+ provided
+ ${office.version}
com.casic
casic-admin-support
- ${casic.version}
-
-
- com.casic
- casic-iris-support
- ${casic.version}
+ ${admin.version}
com.casic
casic-iris-device
- ${casic.version}
+ provided
+ ${pro.version}
+
+
+ com.casic
+ casic-iris-support
+ ${pro.version}
+
+
+ com.casic
+ casic-export-support
+ ${admin.version}
+ compile
diff --git a/casic-iris-atd/pom.xml b/casic-iris-atd/pom.xml
index 511129e..fc075a6 100644
--- a/casic-iris-atd/pom.xml
+++ b/casic-iris-atd/pom.xml
@@ -8,9 +8,7 @@
1.0.0-SNAPSHOT
../pom.xml
-
casic-iris-atd
- ${pro.version}
jar
casic-iris-atd
虹膜考勤系统 Attendance System
@@ -20,39 +18,39 @@
com.casic
casic-core
- ${casic.version}
+ ${core.version}
com.casic
casic-expands-office
- 1.0.0-SNAPSHOT
+ ${office.version}
com.casic
casic-export-support
- 1.0.0-SNAPSHOT
+ ${admin.version}
com.casic
casic-iris-support
- ${casic.version}
+ ${pro.version}
com.casic
casic-metadata-support
- ${casic.version}
+ ${extension.version}
com.casic
casic-export-support
- ${casic.version}
+ ${admin.version}
com.casic
casic-file-support
- ${casic.version}
+ ${extension.version}
diff --git a/casic-iris-device/pom.xml b/casic-iris-device/pom.xml
index 60207ce..e2c1c35 100644
--- a/casic-iris-device/pom.xml
+++ b/casic-iris-device/pom.xml
@@ -10,7 +10,6 @@
casic-iris-device
- ${pro.version}
jar
casic-iris-device
设备管理
@@ -21,14 +20,14 @@
com.casic
casic-core
- ${casic.version}
+ ${core.version}
com.casic
casic-iris-support
- ${casic.version}
+ ${pro.version}
diff --git a/casic-iris-register/pom.xml b/casic-iris-register/pom.xml
index 007d778..a265222 100644
--- a/casic-iris-register/pom.xml
+++ b/casic-iris-register/pom.xml
@@ -10,7 +10,6 @@
casic-iris-register
- ${pro.version}
jar
casic-iris-register
虹膜注册
@@ -21,28 +20,28 @@
com.casic
casic-core
- ${casic.version}
+ ${core.version}
com.casic
casic-iris-support
- ${casic.version}
+ ${pro.version}
com.casic
casic-metadata-support
- ${casic.version}
+ ${extension.version}
com.casic
casic-export-support
- ${casic.version}
+ ${admin.version}
com.casic
casic-file-support
- ${casic.version}
+ ${extension.version}
diff --git a/casic-iris-support/pom.xml b/casic-iris-support/pom.xml
index 5732dfd..0796b62 100644
--- a/casic-iris-support/pom.xml
+++ b/casic-iris-support/pom.xml
@@ -20,13 +20,13 @@
com.casic
casic-core
- ${casic.version}
+ ${core.version}
com.casic
casic-admin-support
- ${casic.version}
+ ${admin.version}
diff --git a/casic-web/pom.xml b/casic-web/pom.xml
index 71b3a85..bb2c35c 100644
--- a/casic-web/pom.xml
+++ b/casic-web/pom.xml
@@ -59,49 +59,60 @@
com.casic
casic-core
- ${casic.version}
+ ${core.version}
com.casic
casic-admin-support
- ${casic.version}
+ ${admin.version}
com.casic
casic-admin-core
- ${casic.version}
+ ${admin.version}
com.casic
casic-admin-area
- ${casic.version}
+ ${admin.version}
com.casic
casic-admin-init
- ${casic.version}
-
-
- com.casic
- casic-metadata-core
- ${casic.version}
+ ${admin.version}
com.casic
casic-export-support
- 1.0.0-SNAPSHOT
+ ${admin.version}
+
+
+ com.casic
+ casic-metadata-core
+ ${extension.version}
+
+
+ com.casic
+ casic-expands-office
+ ${office.version}
+
+
+ com.casic
+ casic-export-support
+ ${admin.version}
com.casic
casic-admin-export
- ${casic.version}
+ ${admin.version}
com.casic
casic-file
- ${casic.version}
+ ${extension.version}
+
com.casic
casic-iris-support
@@ -207,6 +218,13 @@
true
true
+
+
+
+ repackage
+
+
+
maven-assembly-plugin
diff --git a/casic-web/src/main/resources/application.yml b/casic-web/src/main/resources/application.yml
deleted file mode 100644
index c80502c..0000000
--- a/casic-web/src/main/resources/application.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-##########################################################
-################## 所有profile共有的配置 #################
-##########################################################
-spring:
- profiles:
- active: @activatedProperties@
- datasource:
- driver-class-name: com.mysql.jdbc.Driver
- jms:
- pub-sub-domain: true
- aop:
- proxy-target-class: true #false为启用jdk默认动态代理,true为cglib动态代理
-################### mybatis-plus配置 ###################
-################### guns配置 ###################
-casic:
- kaptcha-open: true #是否开启登录时验证码 (true/false)
- nologin-urls: /user/login,/kaptcha,/config/baseConfig
-mybatis-plus:
- global-config:
- sql-injector: com.casic.missiles.modular.metadata.inject.MetaSqlInject
-
-server:
- tomcat:
- max-http-post-size: -1
\ No newline at end of file
diff --git a/casic-web/src/main/resources/config/application.yml b/casic-web/src/main/resources/config/application.yml
new file mode 100644
index 0000000..c80502c
--- /dev/null
+++ b/casic-web/src/main/resources/config/application.yml
@@ -0,0 +1,24 @@
+##########################################################
+################## 所有profile共有的配置 #################
+##########################################################
+spring:
+ profiles:
+ active: @activatedProperties@
+ datasource:
+ driver-class-name: com.mysql.jdbc.Driver
+ jms:
+ pub-sub-domain: true
+ aop:
+ proxy-target-class: true #false为启用jdk默认动态代理,true为cglib动态代理
+################### mybatis-plus配置 ###################
+################### guns配置 ###################
+casic:
+ kaptcha-open: true #是否开启登录时验证码 (true/false)
+ nologin-urls: /user/login,/kaptcha,/config/baseConfig
+mybatis-plus:
+ global-config:
+ sql-injector: com.casic.missiles.modular.metadata.inject.MetaSqlInject
+
+server:
+ tomcat:
+ max-http-post-size: -1
\ No newline at end of file
diff --git a/casic-iris-acs/pom.xml b/casic-iris-acs/pom.xml
index c13d0cf..173a3ef 100644
--- a/casic-iris-acs/pom.xml
+++ b/casic-iris-acs/pom.xml
@@ -10,7 +10,6 @@
casic-iris-acs
- ${pro.version}
jar
casic-iris-acs
虹膜门禁系统 Access Control System
@@ -20,39 +19,42 @@
com.casic
casic-core
- ${casic.version}
+ ${core.version}
com.casic
casic-admin-support
- ${casic.version}
-
-
- com.casic
- casic-export-support
- 1.0.0-SNAPSHOT
+ ${admin.version}
com.casic
casic-expands-office
- 1.0.0-SNAPSHOT
+ provided
+ ${office.version}
com.casic
casic-admin-support
- ${casic.version}
-
-
- com.casic
- casic-iris-support
- ${casic.version}
+ ${admin.version}
com.casic
casic-iris-device
- ${casic.version}
+ provided
+ ${pro.version}
+
+
+ com.casic
+ casic-iris-support
+ ${pro.version}
+
+
+ com.casic
+ casic-export-support
+ ${admin.version}
+ compile
diff --git a/casic-iris-atd/pom.xml b/casic-iris-atd/pom.xml
index 511129e..fc075a6 100644
--- a/casic-iris-atd/pom.xml
+++ b/casic-iris-atd/pom.xml
@@ -8,9 +8,7 @@
1.0.0-SNAPSHOT
../pom.xml
-
casic-iris-atd
- ${pro.version}
jar
casic-iris-atd
虹膜考勤系统 Attendance System
@@ -20,39 +18,39 @@
com.casic
casic-core
- ${casic.version}
+ ${core.version}
com.casic
casic-expands-office
- 1.0.0-SNAPSHOT
+ ${office.version}
com.casic
casic-export-support
- 1.0.0-SNAPSHOT
+ ${admin.version}
com.casic
casic-iris-support
- ${casic.version}
+ ${pro.version}
com.casic
casic-metadata-support
- ${casic.version}
+ ${extension.version}
com.casic
casic-export-support
- ${casic.version}
+ ${admin.version}
com.casic
casic-file-support
- ${casic.version}
+ ${extension.version}
diff --git a/casic-iris-device/pom.xml b/casic-iris-device/pom.xml
index 60207ce..e2c1c35 100644
--- a/casic-iris-device/pom.xml
+++ b/casic-iris-device/pom.xml
@@ -10,7 +10,6 @@
casic-iris-device
- ${pro.version}
jar
casic-iris-device
设备管理
@@ -21,14 +20,14 @@
com.casic
casic-core
- ${casic.version}
+ ${core.version}
com.casic
casic-iris-support
- ${casic.version}
+ ${pro.version}
diff --git a/casic-iris-register/pom.xml b/casic-iris-register/pom.xml
index 007d778..a265222 100644
--- a/casic-iris-register/pom.xml
+++ b/casic-iris-register/pom.xml
@@ -10,7 +10,6 @@
casic-iris-register
- ${pro.version}
jar
casic-iris-register
虹膜注册
@@ -21,28 +20,28 @@
com.casic
casic-core
- ${casic.version}
+ ${core.version}
com.casic
casic-iris-support
- ${casic.version}
+ ${pro.version}
com.casic
casic-metadata-support
- ${casic.version}
+ ${extension.version}
com.casic
casic-export-support
- ${casic.version}
+ ${admin.version}
com.casic
casic-file-support
- ${casic.version}
+ ${extension.version}
diff --git a/casic-iris-support/pom.xml b/casic-iris-support/pom.xml
index 5732dfd..0796b62 100644
--- a/casic-iris-support/pom.xml
+++ b/casic-iris-support/pom.xml
@@ -20,13 +20,13 @@
com.casic
casic-core
- ${casic.version}
+ ${core.version}
com.casic
casic-admin-support
- ${casic.version}
+ ${admin.version}
diff --git a/casic-web/pom.xml b/casic-web/pom.xml
index 71b3a85..bb2c35c 100644
--- a/casic-web/pom.xml
+++ b/casic-web/pom.xml
@@ -59,49 +59,60 @@
com.casic
casic-core
- ${casic.version}
+ ${core.version}
com.casic
casic-admin-support
- ${casic.version}
+ ${admin.version}
com.casic
casic-admin-core
- ${casic.version}
+ ${admin.version}
com.casic
casic-admin-area
- ${casic.version}
+ ${admin.version}
com.casic
casic-admin-init
- ${casic.version}
-
-
- com.casic
- casic-metadata-core
- ${casic.version}
+ ${admin.version}
com.casic
casic-export-support
- 1.0.0-SNAPSHOT
+ ${admin.version}
+
+
+ com.casic
+ casic-metadata-core
+ ${extension.version}
+
+
+ com.casic
+ casic-expands-office
+ ${office.version}
+
+
+ com.casic
+ casic-export-support
+ ${admin.version}
com.casic
casic-admin-export
- ${casic.version}
+ ${admin.version}
com.casic
casic-file
- ${casic.version}
+ ${extension.version}
+
com.casic
casic-iris-support
@@ -207,6 +218,13 @@
true
true
+
+
+
+ repackage
+
+
+
maven-assembly-plugin
diff --git a/casic-web/src/main/resources/application.yml b/casic-web/src/main/resources/application.yml
deleted file mode 100644
index c80502c..0000000
--- a/casic-web/src/main/resources/application.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-##########################################################
-################## 所有profile共有的配置 #################
-##########################################################
-spring:
- profiles:
- active: @activatedProperties@
- datasource:
- driver-class-name: com.mysql.jdbc.Driver
- jms:
- pub-sub-domain: true
- aop:
- proxy-target-class: true #false为启用jdk默认动态代理,true为cglib动态代理
-################### mybatis-plus配置 ###################
-################### guns配置 ###################
-casic:
- kaptcha-open: true #是否开启登录时验证码 (true/false)
- nologin-urls: /user/login,/kaptcha,/config/baseConfig
-mybatis-plus:
- global-config:
- sql-injector: com.casic.missiles.modular.metadata.inject.MetaSqlInject
-
-server:
- tomcat:
- max-http-post-size: -1
\ No newline at end of file
diff --git a/casic-web/src/main/resources/config/application.yml b/casic-web/src/main/resources/config/application.yml
new file mode 100644
index 0000000..c80502c
--- /dev/null
+++ b/casic-web/src/main/resources/config/application.yml
@@ -0,0 +1,24 @@
+##########################################################
+################## 所有profile共有的配置 #################
+##########################################################
+spring:
+ profiles:
+ active: @activatedProperties@
+ datasource:
+ driver-class-name: com.mysql.jdbc.Driver
+ jms:
+ pub-sub-domain: true
+ aop:
+ proxy-target-class: true #false为启用jdk默认动态代理,true为cglib动态代理
+################### mybatis-plus配置 ###################
+################### guns配置 ###################
+casic:
+ kaptcha-open: true #是否开启登录时验证码 (true/false)
+ nologin-urls: /user/login,/kaptcha,/config/baseConfig
+mybatis-plus:
+ global-config:
+ sql-injector: com.casic.missiles.modular.metadata.inject.MetaSqlInject
+
+server:
+ tomcat:
+ max-http-post-size: -1
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 64cf507..a4a043c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,14 @@
UTF-8
1.8
1.0.0-SNAPSHOT
- 1.0.0-SNAPSHOT
+
+ 1.0.0.alpha
+
+
+ 1.0.0.alpha
+
+ 1.0.0.alpha
+ 1.0.0.alpha
1.0.5
1.4.0
2.1.8
@@ -46,10 +53,8 @@
4.0.0
ojdbc6-11.1.0.7.0
-
-
org.springframework.boot
spring-boot-dependencies
@@ -61,42 +66,38 @@
com.casic
casic-core
- ${casic.version}
+ ${core.version}
com.casic
casic-admin-support
- ${casic.version}
+ ${admin.version}
-
-
-
-
com.casic
casic-iris-acs
- ${casic.version}
+ ${pro.version}
com.casic
casic-iris-device
- ${casic.version}
+ ${pro.version}
com.casic
casic-iris-support
- ${casic.version}
+ ${pro.version}
com.casic
casic-iris-register
- ${casic.version}
+ ${pro.version}
com.casic
casic-iris-atd
- ${casic.version}
+ ${pro.version}
@@ -222,12 +223,14 @@
${java.version}
${java.version}
+
org.springframework.boot
spring-boot-maven-plugin
1.5.9.RELEASE
+