diff --git a/.gitignore b/.gitignore index 9ff907aa..cdc6c2fd 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,4 @@ *.iml target .log -zhengAdmin \ No newline at end of file +zheng-admin \ No newline at end of file diff --git a/zheng-upms/zheng-upms-server/pom.xml b/zheng-upms/zheng-upms-server/pom.xml index 53380b56..eeba4202 100644 --- a/zheng-upms/zheng-upms-server/pom.xml +++ b/zheng-upms/zheng-upms-server/pom.xml @@ -21,8 +21,8 @@ 1.0.0 - com.github.shuzheng - zhengAdmin + com.zheng + zheng-admin 1.0.0 diff --git a/zheng-upms/zheng-upms-server/src/main/java/com/zheng/upms/admin/util/ZhengAdminUtil.java b/zheng-upms/zheng-upms-server/src/main/java/com/zheng/upms/admin/util/ZhengAdminUtil.java index cf8db0ef..b3a8f2f9 100644 --- a/zheng-upms/zheng-upms-server/src/main/java/com/zheng/upms/admin/util/ZhengAdminUtil.java +++ b/zheng-upms/zheng-upms-server/src/main/java/com/zheng/upms/admin/util/ZhengAdminUtil.java @@ -2,7 +2,6 @@ package com.zheng.upms.admin.util; import com.zheng.common.util.JarUtil; import com.zheng.common.util.PropertiesFileUtil; -import com.zheng.upms.admin.controller.SSOController; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.InitializingBean; @@ -25,15 +24,15 @@ public class ZhengAdminUtil implements InitializingBean, ServletContextAware { @Override public void setServletContext(ServletContext servletContext) { - _log.info("===== 开始解压zhengAdmin ====="); - String version = PropertiesFileUtil.getInstance().get("zhengAdmin.version"); - _log.info("zhengAdmin.jar 版本: {}", version); - String jarPath = servletContext.getRealPath("/WEB-INF/lib/zhengAdmin-" + version + ".jar"); - _log.info("zhengAdmin.jar 包路径: {}", jarPath); - String resources = servletContext.getRealPath("/resources/zhengAdmin"); - _log.info("zhengAdmin.jar 解压到: {}", resources); + _log.info("===== 开始解压zheng-admin ====="); + String version = PropertiesFileUtil.getInstance().get("zheng-admin.version"); + _log.info("zheng-admin.jar 版本: {}", version); + String jarPath = servletContext.getRealPath("/WEB-INF/lib/zheng-admin-" + version + ".jar"); + _log.info("zheng-admin.jar 包路径: {}", jarPath); + String resources = servletContext.getRealPath("/resources/zheng-admin"); + _log.info("zheng-admin.jar 解压到: {}", resources); JarUtil.decompress(jarPath, resources); - _log.info("===== 解压zhengAdmin完成 ====="); + _log.info("===== 解压zheng-admin完成 ====="); } } diff --git a/zheng-upms/zheng-upms-server/src/main/resources/config.properties b/zheng-upms/zheng-upms-server/src/main/resources/config.properties index d753bb17..d222682e 100644 --- a/zheng-upms/zheng-upms-server/src/main/resources/config.properties +++ b/zheng-upms/zheng-upms-server/src/main/resources/config.properties @@ -1,2 +1,2 @@ env=${profile.env} -zhengAdmin.version=1.0.0 \ No newline at end of file +zheng-admin.version=${zheng-admin.version} \ No newline at end of file diff --git a/zheng-upms/zheng-upms-server/src/main/resources/profiles/dev.properties b/zheng-upms/zheng-upms-server/src/main/resources/profiles/dev.properties index baede636..b3ba3b19 100644 --- a/zheng-upms/zheng-upms-server/src/main/resources/profiles/dev.properties +++ b/zheng-upms/zheng-upms-server/src/main/resources/profiles/dev.properties @@ -1 +1,2 @@ -profile.env=dev \ No newline at end of file +profile.env=dev +zheng-admin.version=1.0.0 \ No newline at end of file diff --git a/zheng-upms/zheng-upms-server/src/main/resources/profiles/prod.properties b/zheng-upms/zheng-upms-server/src/main/resources/profiles/prod.properties index bb7a8fdf..f54e4c11 100644 --- a/zheng-upms/zheng-upms-server/src/main/resources/profiles/prod.properties +++ b/zheng-upms/zheng-upms-server/src/main/resources/profiles/prod.properties @@ -1 +1,2 @@ -profile.env=prod \ No newline at end of file +profile.env=prod +zheng-admin.version=1.0.0 \ No newline at end of file diff --git a/zheng-upms/zheng-upms-server/src/main/resources/profiles/test.properties b/zheng-upms/zheng-upms-server/src/main/resources/profiles/test.properties index 4ff006f4..1a83db21 100644 --- a/zheng-upms/zheng-upms-server/src/main/resources/profiles/test.properties +++ b/zheng-upms/zheng-upms-server/src/main/resources/profiles/test.properties @@ -1 +1,2 @@ -profile.env=test \ No newline at end of file +profile.env=test +zheng-admin.version=1.0.0 \ No newline at end of file