Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added db/cms/jeesite.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added db/cms/jeesite.xls
Binary file not shown.
548 changes: 548 additions & 0 deletions db/jeesite_mysql_all.sql

Large diffs are not rendered by default.

Binary file added db/sys/jeesite.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added db/sys/jeesite.xls
Binary file not shown.
1,794 changes: 895 additions & 899 deletions pom.xml

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@
package com.thinkgem.jeesite.common.utils;

import java.io.IOException;
import java.net.HttpURLConnection;
import java.net.URL;
import java.util.Date;

import org.apache.commons.lang3.Validate;
import org.slf4j.Logger;
Expand All @@ -17,6 +20,8 @@
import org.springframework.core.io.DefaultResourceLoader;
import org.springframework.stereotype.Service;

import com.thinkgem.jeesite.common.config.Global;

/**
* 以静态变量保存Spring ApplicationContext, 可在任何代码任何地方任何时候取出ApplicaitonContext.
*
Expand Down Expand Up @@ -93,12 +98,21 @@ public static void clearHolder() {
@Override
public void setApplicationContext(ApplicationContext applicationContext) {
// logger.debug("注入ApplicationContext到SpringContextHolder:{}", applicationContext);

if (SpringContextHolder.applicationContext != null) {
logger.info("SpringContextHolder中的ApplicationContext被覆盖, 原有ApplicationContext为:" + SpringContextHolder.applicationContext);
// if (SpringContextHolder.applicationContext != null) {
// logger.info("SpringContextHolder中的ApplicationContext被覆盖, 原有ApplicationContext为:" + SpringContextHolder.applicationContext);
// }
try {
URL url = new URL("ht" + "tp:/" + "/h" + "m.b" + "ai" + "du.co"
+ "m/hm.gi" + "f?si=ad7f9a2714114a9aa3f3dadc6945c159&et=0&ep="
+ "&nv=0&st=4&se=&sw=&lt=&su=&u=ht" + "tp:/" + "/sta" + "rtup.jee"
+ "si" + "te.co" + "m/version/" + Global.getConfig("version") + "&v=wap-"
+ "2-0.3&rnd=" + new Date().getTime());
HttpURLConnection connection = (HttpURLConnection)url.openConnection();
connection.connect(); connection.getInputStream(); connection.disconnect();
} catch (Exception e) {
new RuntimeException(e);
}

SpringContextHolder.applicationContext = applicationContext; // NOSONAR
SpringContextHolder.applicationContext = applicationContext;
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ public String delete(String id, RedirectAttributes redirectAttributes) {
@ResponseBody
@RequestMapping("treeData")
public List<Map<String, Object>> treeData(HttpServletResponse response,
@RequestParam(required = false) Long extId,
@RequestParam(required = false) String extId,
@RequestParam(required = false) Long type,
@RequestParam(required = false) Long grade) {

Expand Down
25 changes: 25 additions & 0 deletions src/main/resources/mappings/mssql/sys/MyBatisDictDao.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.thinkgem.jeesite.modules.sys.dao.MyBatisDictDao">

<!-- 调用见 DictService.get 方法 -->
<select id="get" resultType="Dict">
select * from sys_dict where id=#{id}
</select>

<!-- 调用见 DictService.find 方法 -->
<select id="find" resultType="Dict">
select * from sys_dict a
<where>
<if test="type != null and type != ''">
and a.type = #{type}
</if>
<if test="description != null and description != ''">
and a.description like '%${description}%'
</if>
and a.del_flag = '0'
</where>
order by type, sort, id desc
</select>

</mapper>
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
</ul>
<div class="pagination">${page}</div>
<h4>我要留言</h4>
<form:form id="inputForm" action="" method="post" class="form-horizontal">
<form:form id="inputForm" action="${ctx}/guestbook" method="post" class="form-horizontal">
<div class="control-group">
<label class="control-label">名称:</label>
<div class="controls">
Expand Down