diff --git a/casic-service-assess/pom.xml b/casic-service-assess/pom.xml index 6d7748b..825851b 100644 --- a/casic-service-assess/pom.xml +++ b/casic-service-assess/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.casic - casic-smartcity-dcms-cz + casic-smartcity-dcms-cr 1.0.0-SNAPSHOT ../pom.xml diff --git a/casic-service-assess/pom.xml b/casic-service-assess/pom.xml index 6d7748b..825851b 100644 --- a/casic-service-assess/pom.xml +++ b/casic-service-assess/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.casic - casic-smartcity-dcms-cz + casic-smartcity-dcms-cr 1.0.0-SNAPSHOT ../pom.xml diff --git a/casic-service-bms/pom.xml b/casic-service-bms/pom.xml index 5f6fb5c..57a4639 100644 --- a/casic-service-bms/pom.xml +++ b/casic-service-bms/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.casic - casic-smartcity-dcms-cz + casic-smartcity-dcms-cr 1.0.0-SNAPSHOT ../pom.xml diff --git a/casic-service-assess/pom.xml b/casic-service-assess/pom.xml index 6d7748b..825851b 100644 --- a/casic-service-assess/pom.xml +++ b/casic-service-assess/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.casic - casic-smartcity-dcms-cz + casic-smartcity-dcms-cr 1.0.0-SNAPSHOT ../pom.xml diff --git a/casic-service-bms/pom.xml b/casic-service-bms/pom.xml index 5f6fb5c..57a4639 100644 --- a/casic-service-bms/pom.xml +++ b/casic-service-bms/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.casic - casic-smartcity-dcms-cz + casic-smartcity-dcms-cr 1.0.0-SNAPSHOT ../pom.xml diff --git a/casic-service-cws/casic-cws-flow/pom.xml b/casic-service-cws/casic-cws-flow/pom.xml index a4d7158..773ded0 100644 --- a/casic-service-cws/casic-cws-flow/pom.xml +++ b/casic-service-cws/casic-cws-flow/pom.xml @@ -19,17 +19,17 @@ com.casic casic-core - ${casic.version} + ${extension.version} com.casic casic-flow-flowable - ${casic.version} + ${extension.version} com.casic casic-admin-support - ${casic.version} + ${admin.version} diff --git a/casic-service-assess/pom.xml b/casic-service-assess/pom.xml index 6d7748b..825851b 100644 --- a/casic-service-assess/pom.xml +++ b/casic-service-assess/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.casic - casic-smartcity-dcms-cz + casic-smartcity-dcms-cr 1.0.0-SNAPSHOT ../pom.xml diff --git a/casic-service-bms/pom.xml b/casic-service-bms/pom.xml index 5f6fb5c..57a4639 100644 --- a/casic-service-bms/pom.xml +++ b/casic-service-bms/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.casic - casic-smartcity-dcms-cz + casic-smartcity-dcms-cr 1.0.0-SNAPSHOT ../pom.xml diff --git a/casic-service-cws/casic-cws-flow/pom.xml b/casic-service-cws/casic-cws-flow/pom.xml index a4d7158..773ded0 100644 --- a/casic-service-cws/casic-cws-flow/pom.xml +++ b/casic-service-cws/casic-cws-flow/pom.xml @@ -19,17 +19,17 @@ com.casic casic-core - ${casic.version} + ${extension.version} com.casic casic-flow-flowable - ${casic.version} + ${extension.version} com.casic casic-admin-support - ${casic.version} + ${admin.version} diff --git a/casic-service-cws/pom.xml b/casic-service-cws/pom.xml index 4a25f08..e039daa 100644 --- a/casic-service-cws/pom.xml +++ b/casic-service-cws/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.casic - casic-smartcity-dcms-cz + casic-smartcity-dcms-cr 1.0.0-SNAPSHOT ../pom.xml @@ -28,7 +28,7 @@ com.casic casic-flow-flowable - ${casic.version} + ${extension.version} com.casic diff --git a/casic-service-assess/pom.xml b/casic-service-assess/pom.xml index 6d7748b..825851b 100644 --- a/casic-service-assess/pom.xml +++ b/casic-service-assess/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.casic - casic-smartcity-dcms-cz + casic-smartcity-dcms-cr 1.0.0-SNAPSHOT ../pom.xml diff --git a/casic-service-bms/pom.xml b/casic-service-bms/pom.xml index 5f6fb5c..57a4639 100644 --- a/casic-service-bms/pom.xml +++ b/casic-service-bms/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.casic - casic-smartcity-dcms-cz + casic-smartcity-dcms-cr 1.0.0-SNAPSHOT ../pom.xml diff --git a/casic-service-cws/casic-cws-flow/pom.xml b/casic-service-cws/casic-cws-flow/pom.xml index a4d7158..773ded0 100644 --- a/casic-service-cws/casic-cws-flow/pom.xml +++ b/casic-service-cws/casic-cws-flow/pom.xml @@ -19,17 +19,17 @@ com.casic casic-core - ${casic.version} + ${extension.version} com.casic casic-flow-flowable - ${casic.version} + ${extension.version} com.casic casic-admin-support - ${casic.version} + ${admin.version} diff --git a/casic-service-cws/pom.xml b/casic-service-cws/pom.xml index 4a25f08..e039daa 100644 --- a/casic-service-cws/pom.xml +++ b/casic-service-cws/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.casic - casic-smartcity-dcms-cz + casic-smartcity-dcms-cr 1.0.0-SNAPSHOT ../pom.xml @@ -28,7 +28,7 @@ com.casic casic-flow-flowable - ${casic.version} + ${extension.version} com.casic diff --git a/casic-service-support/pom.xml b/casic-service-support/pom.xml index 0f67041..a78946d 100644 --- a/casic-service-support/pom.xml +++ b/casic-service-support/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.casic - casic-smartcity-dcms-cz + casic-smartcity-dcms-cr 1.0.0-SNAPSHOT ../pom.xml diff --git a/casic-service-assess/pom.xml b/casic-service-assess/pom.xml index 6d7748b..825851b 100644 --- a/casic-service-assess/pom.xml +++ b/casic-service-assess/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.casic - casic-smartcity-dcms-cz + casic-smartcity-dcms-cr 1.0.0-SNAPSHOT ../pom.xml diff --git a/casic-service-bms/pom.xml b/casic-service-bms/pom.xml index 5f6fb5c..57a4639 100644 --- a/casic-service-bms/pom.xml +++ b/casic-service-bms/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.casic - casic-smartcity-dcms-cz + casic-smartcity-dcms-cr 1.0.0-SNAPSHOT ../pom.xml diff --git a/casic-service-cws/casic-cws-flow/pom.xml b/casic-service-cws/casic-cws-flow/pom.xml index a4d7158..773ded0 100644 --- a/casic-service-cws/casic-cws-flow/pom.xml +++ b/casic-service-cws/casic-cws-flow/pom.xml @@ -19,17 +19,17 @@ com.casic casic-core - ${casic.version} + ${extension.version} com.casic casic-flow-flowable - ${casic.version} + ${extension.version} com.casic casic-admin-support - ${casic.version} + ${admin.version} diff --git a/casic-service-cws/pom.xml b/casic-service-cws/pom.xml index 4a25f08..e039daa 100644 --- a/casic-service-cws/pom.xml +++ b/casic-service-cws/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.casic - casic-smartcity-dcms-cz + casic-smartcity-dcms-cr 1.0.0-SNAPSHOT ../pom.xml @@ -28,7 +28,7 @@ com.casic casic-flow-flowable - ${casic.version} + ${extension.version} com.casic diff --git a/casic-service-support/pom.xml b/casic-service-support/pom.xml index 0f67041..a78946d 100644 --- a/casic-service-support/pom.xml +++ b/casic-service-support/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.casic - casic-smartcity-dcms-cz + casic-smartcity-dcms-cr 1.0.0-SNAPSHOT ../pom.xml diff --git a/casic-web/src/main/java/com/casic/missiles/controller/MockController.java b/casic-web/src/main/java/com/casic/missiles/controller/MockController.java index 0051e60..17f93e8 100644 --- a/casic-web/src/main/java/com/casic/missiles/controller/MockController.java +++ b/casic-web/src/main/java/com/casic/missiles/controller/MockController.java @@ -1,23 +1,20 @@ package com.casic.missiles.controller; import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.response.SuccessResponseData; import com.casic.missiles.core.log.LogManager; import com.casic.missiles.core.log.factory.LogTaskFactory; -import com.casic.missiles.core.base.response.SuccessResponseData; import com.casic.missiles.core.shiro.ShiroKit; import com.casic.missiles.core.shiro.ShiroUser; import com.casic.missiles.core.util.RSAUtils; import com.casic.missiles.core.util.ToolUtil; -import com.casic.missiles.modular.contant.PermissionContant; +import com.casic.missiles.modular.constant.PermissionContant; import com.casic.missiles.modular.system.dto.LoginResult; -import org.apache.commons.lang3.StringUtils; import org.apache.shiro.authc.UsernamePasswordToken; import org.apache.shiro.subject.Subject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; diff --git a/casic-service-assess/pom.xml b/casic-service-assess/pom.xml index 6d7748b..825851b 100644 --- a/casic-service-assess/pom.xml +++ b/casic-service-assess/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.casic - casic-smartcity-dcms-cz + casic-smartcity-dcms-cr 1.0.0-SNAPSHOT ../pom.xml diff --git a/casic-service-bms/pom.xml b/casic-service-bms/pom.xml index 5f6fb5c..57a4639 100644 --- a/casic-service-bms/pom.xml +++ b/casic-service-bms/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.casic - casic-smartcity-dcms-cz + casic-smartcity-dcms-cr 1.0.0-SNAPSHOT ../pom.xml diff --git a/casic-service-cws/casic-cws-flow/pom.xml b/casic-service-cws/casic-cws-flow/pom.xml index a4d7158..773ded0 100644 --- a/casic-service-cws/casic-cws-flow/pom.xml +++ b/casic-service-cws/casic-cws-flow/pom.xml @@ -19,17 +19,17 @@ com.casic casic-core - ${casic.version} + ${extension.version} com.casic casic-flow-flowable - ${casic.version} + ${extension.version} com.casic casic-admin-support - ${casic.version} + ${admin.version} diff --git a/casic-service-cws/pom.xml b/casic-service-cws/pom.xml index 4a25f08..e039daa 100644 --- a/casic-service-cws/pom.xml +++ b/casic-service-cws/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.casic - casic-smartcity-dcms-cz + casic-smartcity-dcms-cr 1.0.0-SNAPSHOT ../pom.xml @@ -28,7 +28,7 @@ com.casic casic-flow-flowable - ${casic.version} + ${extension.version} com.casic diff --git a/casic-service-support/pom.xml b/casic-service-support/pom.xml index 0f67041..a78946d 100644 --- a/casic-service-support/pom.xml +++ b/casic-service-support/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.casic - casic-smartcity-dcms-cz + casic-smartcity-dcms-cr 1.0.0-SNAPSHOT ../pom.xml diff --git a/casic-web/src/main/java/com/casic/missiles/controller/MockController.java b/casic-web/src/main/java/com/casic/missiles/controller/MockController.java index 0051e60..17f93e8 100644 --- a/casic-web/src/main/java/com/casic/missiles/controller/MockController.java +++ b/casic-web/src/main/java/com/casic/missiles/controller/MockController.java @@ -1,23 +1,20 @@ package com.casic.missiles.controller; import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.response.SuccessResponseData; import com.casic.missiles.core.log.LogManager; import com.casic.missiles.core.log.factory.LogTaskFactory; -import com.casic.missiles.core.base.response.SuccessResponseData; import com.casic.missiles.core.shiro.ShiroKit; import com.casic.missiles.core.shiro.ShiroUser; import com.casic.missiles.core.util.RSAUtils; import com.casic.missiles.core.util.ToolUtil; -import com.casic.missiles.modular.contant.PermissionContant; +import com.casic.missiles.modular.constant.PermissionContant; import com.casic.missiles.modular.system.dto.LoginResult; -import org.apache.commons.lang3.StringUtils; import org.apache.shiro.authc.UsernamePasswordToken; import org.apache.shiro.subject.Subject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; diff --git a/pom.xml b/pom.xml index e0a6791..46ccca6 100644 --- a/pom.xml +++ b/pom.xml @@ -2,9 +2,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 com.casic - casic-smartcity-dcms-cz + casic-smartcity-dcms-cr 1.0.0-SNAPSHOT - casic-smartcity-dcms-cz + casic-smartcity-dcms-cr pom casic-web