SkyID
/
zheng
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

集成zheng-admin模块

This commit is contained in:
shuzheng 2017-01-09 16:41:15 +08:00
parent ea043b2b40
commit 152e993fbe
7 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -2,4 +2,4 @@
*.iml *.iml
target target
.log .log
zhengAdmin zheng-admin

4
zheng-upms/zheng-upms-server/pom.xml
View File

@ -21,8 +21,8 @@
<version>1.0.0</version> <version>1.0.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.github.shuzheng</groupId> <groupId>com.zheng</groupId>
<artifactId>zhengAdmin</artifactId> <artifactId>zheng-admin</artifactId>
<version>1.0.0</version> <version>1.0.0</version>
</dependency> </dependency>
<dependency> <dependency>

17
zheng-upms/zheng-upms-server/src/main/java/com/zheng/upms/admin/util/ZhengAdminUtil.java
View File

@ -2,7 +2,6 @@ package com.zheng.upms.admin.util;
import com.zheng.common.util.JarUtil; import com.zheng.common.util.JarUtil;
import com.zheng.common.util.PropertiesFileUtil; import com.zheng.common.util.PropertiesFileUtil;
import com.zheng.upms.admin.controller.SSOController;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.InitializingBean; import org.springframework.beans.factory.InitializingBean;
@ -25,15 +24,15 @@ public class ZhengAdminUtil implements InitializingBean, ServletContextAware {
@Override @Override
public void setServletContext(ServletContext servletContext) { public void setServletContext(ServletContext servletContext) {
_log.info("===== 开始解压zhengAdmin ====="); _log.info("===== 开始解压zheng-admin =====");
String version = PropertiesFileUtil.getInstance().get("zhengAdmin.version"); String version = PropertiesFileUtil.getInstance().get("zheng-admin.version");
_log.info("zhengAdmin.jar 版本: {}", version); _log.info("zheng-admin.jar 版本: {}", version);
String jarPath = servletContext.getRealPath("/WEB-INF/lib/zhengAdmin-" + version + ".jar"); String jarPath = servletContext.getRealPath("/WEB-INF/lib/zheng-admin-" + version + ".jar");
_log.info("zhengAdmin.jar 包路径: {}", jarPath); _log.info("zheng-admin.jar 包路径: {}", jarPath);
String resources = servletContext.getRealPath("/resources/zhengAdmin"); String resources = servletContext.getRealPath("/resources/zheng-admin");
_log.info("zhengAdmin.jar 解压到: {}", resources); _log.info("zheng-admin.jar 解压到: {}", resources);
JarUtil.decompress(jarPath, resources); JarUtil.decompress(jarPath, resources);
_log.info("===== 解压zhengAdmin完成 ====="); _log.info("===== 解压zheng-admin完成 =====");
} }
} }

2
zheng-upms/zheng-upms-server/src/main/resources/config.properties
View File

@ -1,2 +1,2 @@
env=${profile.env} env=${profile.env}
zhengAdmin.version=1.0.0 zheng-admin.version=${zheng-admin.version}

1
zheng-upms/zheng-upms-server/src/main/resources/profiles/dev.properties
View File

@ -1 +1,2 @@
profile.env=dev profile.env=dev
zheng-admin.version=1.0.0

1
zheng-upms/zheng-upms-server/src/main/resources/profiles/prod.properties
View File

@ -1 +1,2 @@
profile.env=prod profile.env=prod
zheng-admin.version=1.0.0

1
zheng-upms/zheng-upms-server/src/main/resources/profiles/test.properties
View File

@ -1 +1,2 @@
profile.env=test profile.env=test
zheng-admin.version=1.0.0