Skip to content

Commit

Permalink
修复bug
Browse files Browse the repository at this point in the history
  • Loading branch information
Husen authored and Husen committed Jan 25, 2018
1 parent 0bd8a7e commit b60d8b5
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 10 deletions.
6 changes: 3 additions & 3 deletions .classpath
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.eclipse.jst.server.tomcat.runtimeTarget/Apache Tomcat v8.5">
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
<attributes>
<attribute name="owner.project.facets" value="jst.web"/>
<attribute name="owner.project.facets" value="java"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.eclipse.jst.server.tomcat.runtimeTarget/Apache Tomcat v8.5"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/web_lib">
<attributes>
<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="output" path="build/classes"/>
</classpath>
1 change: 0 additions & 1 deletion .settings/org.eclipse.wst.common.project.facet.core.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<faceted-project>
<runtime name="Apache Tomcat v8.5"/>
<fixed facet="java"/>
<fixed facet="jst.web"/>
<fixed facet="wst.jsdt.web"/>
Expand Down
4 changes: 2 additions & 2 deletions WebContent/js/navigation/topbar.js
Original file line number Diff line number Diff line change
Expand Up @@ -99,11 +99,11 @@ function chooseSearchType() {
function searchByKeyWords(searchType) {
if (searchType == 'blog') {
$(window).attr('location',
'/topic/blog/?keywords=' + $('#search_keyWords').val());
'/module/blog.hms?keywords=' + $('#search_keyWords').val());
}
if (searchType == 'code') {
$(window).attr('location',
'/topic/code/?keywords=' + $('#search_keyWords').val());
'/module/code.hms?keywords=' + $('#search_keyWords').val());
}
}

Expand Down
6 changes: 4 additions & 2 deletions config/log4j2.xml
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?><!-- 本配置文件的目标是将不同级别的日志输出到不同文件 --><!-- 最大2MB一个文件, 文件数据达到最大值时,旧数据会被压缩并放进指定文件夹 --><!-- status : 这个用于设置log4j2自身内部的信息输出,可以不设置 --><!-- 当设置成trace时,会看到log4j2内部各种详细输出 monitorInterval --><!-- monitorInterval="60"表示每60秒配置文件会动态加载一次。在程序运行过程中,如果修改配置文件,程序会随之改变。 --><Configuration monitorInterval="60" status="WARN">
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE xml>
<!-- 本配置文件的目标是将不同级别的日志输出到不同文件 --><!-- 最大2MB一个文件, 文件数据达到最大值时,旧数据会被压缩并放进指定文件夹 --><!-- status : 这个用于设置log4j2自身内部的信息输出,可以不设置 --><!-- 当设置成trace时,会看到log4j2内部各种详细输出 monitorInterval --><!-- monitorInterval="60"表示每60秒配置文件会动态加载一次。在程序运行过程中,如果修改配置文件,程序会随之改变。 --><Configuration monitorInterval="60" status="WARN">
<!-- 定义通用的属性 -->
<Properties>
<!-- 云端部署 这里的logs为项目根目录下的logs文件夹 -->
<!-- web:rootDir指向web应用根目录,需使用log4j-web.jar -->
<Property name="log_path">G:\workspace\workspace pers\web/logs</Property>
<Property name="log_path">F:\workspace\workspace pers\web/logs</Property>
<!-- 本地开发使用绝对路径定义日志 -->
<!-- <Property name="log_path">${web:rootDir}\logs</Property> -->

Expand Down
2 changes: 1 addition & 1 deletion src/pers/husen/web/config/ProjectDeployConfig.java
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ public static void setGlobalVariable(String deployPath) {
if(IS_REMOTE_DEPLOY) {
WEB_DEPLOY_PATH = new File(deployPath);
}else {
WEB_DEPLOY_PATH = new File("G:/workspace/workspace pers/web/WebContent/");
WEB_DEPLOY_PATH = new File("F:/workspace/workspace pers/web/WebContent/");
}

WEB_ROOT_PATH = WEB_DEPLOY_PATH.getParent();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public void contextInitialized(ServletContextEvent servletContextEvent) {
//将部署根目录赋值给全局变量
ProjectDeployConfig.setGlobalVariable(deployRootDir);
//配置log4j
(new Log4j2Config()).startLog4j2Config();
new Log4j2Config().startLog4j2Config();
}

@Override
Expand Down

0 comments on commit b60d8b5

Please sign in to comment.