Skip to content

S
sfzx-website
Commit 85fe6228 by 丁伟
Options

1、迁移初始提交

parent 43b3e44e
Showing with 30 additions and 58 deletions
docker-compose.yml
......@@ -5,12 +5,13 @@ services:
mysql:
environment:
MYSQL_ROOT_PASSWORD: root
image: itc/mysql:5.5
image: itc/mariadb:10.2
volumes:
- ./mysql/data:/var/lib/mysql
- ./mysql/log:/var/log/mysql
- /dockerv/ccpit.org/itc/sfzx/database:/var/lib/mysql
command: mysqld --lower_case_table_names=1
networks:
hx_net:
ipv4_address: 172.40.0.3
web:
depends_on:
- mysql
......@@ -18,6 +19,16 @@ services:
volumes:
- ./web:/usr/local/tomcat/webapps/ROOT
- ./logs:/logs
- ./upload:/upload
- ./upload.co.ccpit.org:/data/vhosts/upload.co.ccpit.org
ports:
- "30128:8080"
networks:
hx_net:
ipv4_address: 172.40.0.4
networks:
hx_net:
driver: bridge
ipam:
config:
- subnet: 172.40.0.0/24
src/main/java/ccpit/business/coApplication/CoApplicationInfoService.java
......@@ -22,7 +22,6 @@ import ccpit.base.logManage.LogInfoService;
import ccpit.base.user.User;
import ccpit.base.utils.DateConvert;
import ccpit.base.utils.StringUtil;
import ccpit.base.utils.lucene.LuceneUtil;
import ccpit.base.utils.page.PageUtil;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -38,8 +37,7 @@ public class CoApplicationInfoService {
@Autowired
private LogInfoService logInfoService;
@Autowired
private LuceneUtil<CoApplicationInfo> luceneUtil;
public boolean addOrUpdateCoApplicationInfo(CoApplicationInfo coApplicationInfo, String operate,
String coApplicationInfoId, User user, HttpServletRequest request) {
boolean flag = false;
......@@ -48,7 +46,6 @@ public class CoApplicationInfoService {
coApplicationInfo.setCreator(user);
flag = coApplicationInfoDao.save(coApplicationInfo);
if (flag) {
luceneUtil.createIndex(createCoApplicationInfosIndex(coApplicationInfo));
// 记录用户操作日志信息
logInfoService.recordLog(request, "新增CO数据信息");
}
......@@ -60,8 +57,6 @@ public class CoApplicationInfoService {
flag = coApplicationInfoDao.update(coApplicationInfo1);
if (flag) {
// 记录用户操作日志信息
luceneUtil.deleteIndex("n" + coApplicationInfoId);
luceneUtil.createIndex(createCoApplicationInfosIndex(coApplicationInfo1));
logInfoService.recordLog(request, "修改CO数据信息");
}
}
......@@ -81,9 +76,8 @@ public class CoApplicationInfoService {
flag = coApplicationInfoDao.save(coApplicationInfo);
if (flag) {
//luceneUtil.createIndex(createCoApplicationInfosIndex(coApplicationInfo));
// 记录用户操作日志信息
//logInfoService.recordLog(request, "新增CO数据信息");
logInfoService.recordLog(request, "新增CO数据信息");
}
return flag;
......@@ -98,7 +92,6 @@ public class CoApplicationInfoService {
.valueOf(metadataId)));
coApplicationInfo.setDeleted(true);
flag = coApplicationInfoDao.update(coApplicationInfo);
luceneUtil.deleteIndex("n" + metadataId.toString());
}
return flag;
}
......
src/main/java/ccpit/business/newsManage/NewsInfoService.java
......@@ -32,7 +32,6 @@ import ccpit.base.logManage.LogInfoService;
import ccpit.base.user.User;
import ccpit.base.utils.DateConvert;
import ccpit.base.utils.StringUtil;
import ccpit.base.utils.lucene.LuceneUtil;
import ccpit.base.utils.page.PageUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
......@@ -58,8 +57,6 @@ public class NewsInfoService {
@Autowired
private LogInfoService logInfoService;
@Autowired
private LuceneUtil<NewsInfo> luceneUtil;
public boolean addOrUpdateNewsInfo(NewsInfo newsInfo, String operate,
String newsInfoId, User user, HttpServletRequest request) {
......@@ -69,7 +66,6 @@ public class NewsInfoService {
newsInfo.setCreator(user);
flag = newsInfoDao.save(newsInfo);
if (flag) {
luceneUtil.createIndex(createNewsInfosIndex(newsInfo));
// 记录用户操作日志信息
logInfoService.recordLog(request, "新增新闻数据信息");
}
......@@ -80,9 +76,7 @@ public class NewsInfoService {
newsInfo1.setModifyBy(user);
flag = newsInfoDao.update(newsInfo1);
if (flag) {
// 记录用户操作日志信息
luceneUtil.deleteIndex("n" + newsInfoId);
luceneUtil.createIndex(createNewsInfosIndex(newsInfo1));
logInfoService.recordLog(request, "修改新闻数据信息");
}
}
......@@ -98,7 +92,6 @@ public class NewsInfoService {
.valueOf(metadataId)));
newsInfo.setDeleted(true);
flag = newsInfoDao.update(newsInfo);
luceneUtil.deleteIndex("n" + metadataId.toString());
}
return flag;
}
......
src/main/java/ccpit/business/noticeManage/NoticeService.java
......@@ -59,7 +59,6 @@ public class NoticeService {
Notice.setCreator(user);
flag = noticeDao.save(Notice);
if (flag) {
// luceneUtil.createIndex(createNoticesIndex(Notice));
// 记录用户操作日志信息
logInfoService.recordLog(request, "新增通知公告数据信息");
}
......@@ -71,8 +70,6 @@ public class NoticeService {
flag = noticeDao.update(Notice1);
if (flag) {
// 记录用户操作日志信息
// luceneUtil.deleteIndex("n" + NoticeId);
// luceneUtil.createIndex(createNoticesIndex(Notice1));
logInfoService.recordLog(request, "修改通知公告数据信息");
}
}
......@@ -93,7 +90,6 @@ public class NoticeService {
.valueOf(metadataId)));
Notice.setDeleted(true);
flag = noticeDao.update(Notice);
// luceneUtil.deleteIndex("n" + metadataId.toString());
}
return flag;
}
......
src/main/java/ccpit/business/questionsManage/QuestionService.java
......@@ -38,7 +38,6 @@ public class QuestionService {
question.setCreator(user);
flag = questionDao.save(question);
if (flag) {
// luceneUtil.createIndex(createQuestionsIndex(Question));
// 记录用户操作日志信息
logInfoService.recordLog(request, "新增问题数据信息");
}
......@@ -50,8 +49,6 @@ public class QuestionService {
flag = questionDao.update(question1);
if (flag) {
// 记录用户操作日志信息
// luceneUtil.deleteIndex("n" + QuestionId);
// luceneUtil.createIndex(createQuestionsIndex(Question1));
logInfoService.recordLog(request, "修改问题数据信息");
}
}
......@@ -67,7 +64,6 @@ public class QuestionService {
.valueOf(metadataId)));
question.setDeleted(true);
flag = questionDao.update(question);
// luceneUtil.deleteIndex("n" + metadataId.toString());
}
return flag;
}
......
src/main/java/ccpit/business/visaAgencyManage/VisaAgencyService.java
......@@ -25,7 +25,6 @@ import ccpit.base.logManage.LogInfoService;
import ccpit.base.user.User;
import ccpit.base.utils.DateConvert;
import ccpit.base.utils.StringUtil;
import ccpit.base.utils.lucene.LuceneUtil;
import ccpit.base.utils.page.PageUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
......@@ -36,8 +35,6 @@ public class VisaAgencyService {
private VisaAgencyDao visaAgencyDao;
@Autowired
private LogInfoService logInfoService;
@Autowired
private LuceneUtil<VisaAgency> luceneUtil;
public boolean addOrUpdateVisaAgency(VisaAgency visaAgency, String operate,
String visaAgencyId, User user, HttpServletRequest request) {
......@@ -47,7 +44,6 @@ public class VisaAgencyService {
visaAgency.setCreator(user);
flag = visaAgencyDao.save(visaAgency);
if (flag) {
luceneUtil.createIndex(createVisaAgencysIndex(visaAgency));
// 记录用户操作日志信息
logInfoService.recordLog(request, "新增签证机构数据信息");
}
......@@ -59,8 +55,6 @@ public class VisaAgencyService {
flag = visaAgencyDao.update(visaAgency1);
if (flag) {
// 记录用户操作日志信息
luceneUtil.deleteIndex("n" + visaAgencyId);
luceneUtil.createIndex(createVisaAgencysIndex(visaAgency1));
logInfoService.recordLog(request, "修改签证机构数据信息");
}
}
......@@ -76,7 +70,6 @@ public class VisaAgencyService {
.valueOf(metadataId)));
visaAgency.setDeleted(true);
flag = visaAgencyDao.update(visaAgency);
luceneUtil.deleteIndex("n" + metadataId.toString());
}
return flag;
}
......
src/main/java/ccpit/front/IndexController.java
......@@ -25,7 +25,6 @@ import ccpit.base.controller.Page;
import ccpit.base.controller.PageRequest;
import ccpit.base.controller.ValidateCodeController;
import ccpit.base.user.User;
import ccpit.base.utils.lucene.LuceneUtil;
import ccpit.business.coApplication.CoApplicationInfo;
import ccpit.business.coApplication.CoApplicationInfoService;
import ccpit.business.noticeManage.Notice;
......@@ -66,8 +65,7 @@ public class IndexController extends BaseController {
private QuestionService questionService;
@Autowired
private CoApplicationInfoService coApplicationInfoService;
@Autowired
private LuceneUtil luceneUtil;
@Autowired
private TaxableGoodsService taxableGoodsService;
......@@ -263,13 +261,6 @@ public class IndexController extends BaseController {
return mv;
}
String[] searchFields = { "title" };
List<Map<String, Object>> lst = luceneUtil.SearchIndex(queryString,
searchFields);
List<String> result = new LinkedList<String>();
lst.stream().forEach(map -> {
// result.add(indexService.convertResult(map));
});
mv.addObject("result", result);
return mv;
}
......
src/main/webapp/WEB-INF/jsp/admin/metadataManage/metadataListPage.jsp
<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
<%@ taglib prefix="security" uri="http://www.ccpit.org/" %>
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
......
src/main/webapp/WEB-INF/jsp/admin/orgManage/orgListPage.jsp
<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
<%@ taglib prefix="security" uri="http://www.ccpit.org/" %>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
......
src/main/webapp/WEB-INF/jsp/admin/privilegeManage/privilegeListPage.jsp
<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
<%@ taglib prefix="security" uri="http://www.ccpit.org/" %>
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
<head>
......
src/main/webapp/WEB-INF/jsp/admin/privilegeManage/rolePriListPage.jsp
<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
<%@ taglib prefix="security" uri="http://www.ccpit.org/" %>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
<html>
<head>
......
src/main/webapp/WEB-INF/jsp/admin/role/roleListPage.jsp
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<%@ taglib prefix="security" uri="http://www.ccpit.org/" %>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
<html>
<head>
......
src/main/webapp/WEB-INF/jsp/admin/user/manage.jsp
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<%@ taglib prefix="security" uri="http://www.ccpit.org/" %>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
<html>
<head>
......
src/main/webapp/WEB-INF/jsp/business/coApplicationInfoPage.jsp
<%@ page language="java" contentType="text/html; charset=UTF-8"
pageEncoding="UTF-8"%>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
<%@ taglib prefix="security" uri="http://www.ccpit.org/" %>
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
<head>
......
src/main/webapp/WEB-INF/jsp/business/newsInfoPage.jsp
<%@ page language="java" contentType="text/html; charset=UTF-8"
pageEncoding="UTF-8"%>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
<%@ taglib prefix="security" uri="http://www.ccpit.org/" %>
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
<head>
......
src/main/webapp/WEB-INF/jsp/business/noticePage.jsp
<%@ page language="java" contentType="text/html; charset=UTF-8"
pageEncoding="UTF-8"%>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
<%@ taglib prefix="security" uri="http://www.ccpit.org/" %>
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
<head>
......
src/main/webapp/WEB-INF/jsp/business/questionPage.jsp
<%@ page language="java" contentType="text/html; charset=UTF-8"
pageEncoding="UTF-8"%>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
<%@ taglib prefix="security" uri="http://www.ccpit.org/" %>
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
<head>
......
src/main/webapp/WEB-INF/jsp/business/visaAgencyPage.jsp
<%@ page language="java" contentType="text/html; charset=UTF-8"
pageEncoding="UTF-8"%>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
<%@ taglib prefix="security" uri="http://www.ccpit.org/" %>
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
<head>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment