Skip to content

S
sunac_report
Commit a46b32fb by caohongzhe
Options

ReportController:修改发送消息方法。 

reportDetaol:添加dealResult=4为“举报属实”。
reportTrack:修改举报属性个状态可见“是否完成”。
parent 429b85f1
Showing with 1272 additions and 704 deletions
.idea/libraries/Maven__com_itextpdf_itext_asian_5_2_0.xml 0 → 100644
<component name="libraryTable">
<library name="Maven: com.itextpdf:itext-asian:5.2.0">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/com/itextpdf/itext-asian/5.2.0/itext-asian-5.2.0.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/com/itextpdf/itext-asian/5.2.0/itext-asian-5.2.0-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/com/itextpdf/itext-asian/5.2.0/itext-asian-5.2.0-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
.idea/libraries/Maven__com_itextpdf_itextpdf_5_5_10.xml 0 → 100644
<component name="libraryTable">
<library name="Maven: com.itextpdf:itextpdf:5.5.10">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/com/itextpdf/itextpdf/5.5.10/itextpdf-5.5.10.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/com/itextpdf/itextpdf/5.5.10/itextpdf-5.5.10-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/com/itextpdf/itextpdf/5.5.10/itextpdf-5.5.10-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
.idea/libraries/Maven__io_springfox_springfox_core_2_6_1.xml 0 → 100644
<component name="libraryTable">
<library name="Maven: io.springfox:springfox-core:2.6.1">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-core/2.6.1/springfox-core-2.6.1.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-core/2.6.1/springfox-core-2.6.1-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-core/2.6.1/springfox-core-2.6.1-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
.idea/libraries/Maven__io_springfox_springfox_spi_2_6_1.xml 0 → 100644
<component name="libraryTable">
<library name="Maven: io.springfox:springfox-spi:2.6.1">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-spi/2.6.1/springfox-spi-2.6.1.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-spi/2.6.1/springfox-spi-2.6.1-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-spi/2.6.1/springfox-spi-2.6.1-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
.idea/libraries/Maven__io_springfox_springfox_spring_web_2_6_1.xml 0 → 100644
<component name="libraryTable">
<library name="Maven: io.springfox:springfox-spring-web:2.6.1">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-spring-web/2.6.1/springfox-spring-web-2.6.1.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-spring-web/2.6.1/springfox-spring-web-2.6.1-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-spring-web/2.6.1/springfox-spring-web-2.6.1-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
.idea/libraries/Maven__io_springfox_springfox_swagger_ui_2_6_1.xml 0 → 100644
<component name="libraryTable">
<library name="Maven: io.springfox:springfox-swagger-ui:2.6.1">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-swagger-ui/2.6.1/springfox-swagger-ui-2.6.1.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-swagger-ui/2.6.1/springfox-swagger-ui-2.6.1-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-swagger-ui/2.6.1/springfox-swagger-ui-2.6.1-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
.idea/libraries/Maven__io_swagger_swagger_annotations_1_5_16.xml 0 → 100644
<component name="libraryTable">
<library name="Maven: io.swagger:swagger-annotations:1.5.16">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/io/swagger/swagger-annotations/1.5.16/swagger-annotations-1.5.16.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/io/swagger/swagger-annotations/1.5.16/swagger-annotations-1.5.16-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/io/swagger/swagger-annotations/1.5.16/swagger-annotations-1.5.16-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
.idea/libraries/Maven__jfree_jcommon_1_0_16.xml 0 → 100644
<component name="libraryTable">
<library name="Maven: jfree:jcommon:1.0.16">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/jfree/jcommon/1.0.16/jcommon-1.0.16.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/jfree/jcommon/1.0.16/jcommon-1.0.16-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/jfree/jcommon/1.0.16/jcommon-1.0.16-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
.idea/libraries/Maven__jfree_jfreechart_1_0_13.xml 0 → 100644
<component name="libraryTable">
<library name="Maven: jfree:jfreechart:1.0.13">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/jfree/jfreechart/1.0.13/jfreechart-1.0.13.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/jfree/jfreechart/1.0.13/jfreechart-1.0.13-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/jfree/jfreechart/1.0.13/jfreechart-1.0.13-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
.idea/libraries/Maven__org_springframework_plugin_spring_plugin_core_1_2_0_RELEASE.xml 0 → 100644
<component name="libraryTable">
<library name="Maven: org.springframework.plugin:spring-plugin-core:1.2.0.RELEASE">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/springframework/plugin/spring-plugin-core/1.2.0.RELEASE/spring-plugin-core-1.2.0.RELEASE.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/springframework/plugin/spring-plugin-core/1.2.0.RELEASE/spring-plugin-core-1.2.0.RELEASE-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/springframework/plugin/spring-plugin-core/1.2.0.RELEASE/spring-plugin-core-1.2.0.RELEASE-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
.idea/libraries/Maven__org_springframework_plugin_spring_plugin_metadata_1_2_0_RELEASE.xml 0 → 100644
<component name="libraryTable">
<library name="Maven: org.springframework.plugin:spring-plugin-metadata:1.2.0.RELEASE">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/springframework/plugin/spring-plugin-metadata/1.2.0.RELEASE/spring-plugin-metadata-1.2.0.RELEASE.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/springframework/plugin/spring-plugin-metadata/1.2.0.RELEASE/spring-plugin-metadata-1.2.0.RELEASE-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/springframework/plugin/spring-plugin-metadata/1.2.0.RELEASE/spring-plugin-metadata-1.2.0.RELEASE-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
.idea/vcs.xml 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="" vcs="Git" />
<mapping directory="$PROJECT_DIR$" vcs="Git" />
</component>
</project>
\ No newline at end of file
.idea/webContexts.xml 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="WebContextManager">
<option name="state">
<map>
<entry key="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report/reportTrack.jsp" value="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report" />
</map>
</option>
</component>
</project>
\ No newline at end of file
.idea/workspace.xml
...@@ -2,22 +2,92 @@ ...@@ -2,22 +2,92 @@
<project version="4"> <project version="4">
<component name="ArtifactsWorkspaceSettings"> <component name="ArtifactsWorkspaceSettings">
<artifacts-to-build> <artifacts-to-build>
<artifact name="report_sunac:war" />
<artifact name="report_sunac:war exploded" /> <artifact name="report_sunac:war exploded" />
</artifacts-to-build> </artifacts-to-build>
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="8ed2da29-0779-4369-a574-21ca1d21d272" name="Default" comment="放开root的退出"> <list default="true" id="8ed2da29-0779-4369-a574-21ca1d21d272" name="Default" comment="ReportController:修改发送消息方法。&#10;reportDetaol:添加dealResult=4为“举报属实”。&#10;reportTrack:修改举报属性个状态可见“是否完成”。">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/artifacts/report_sunac_war_exploded.xml" afterPath="$PROJECT_DIR$/.idea/artifacts/report_sunac_war_exploded.xml" /> <change beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_itextpdf_itext_asian_5_2_0.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> <change beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_itextpdf_itextpdf_5_5_10.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/report_sunac.iml" afterPath="$PROJECT_DIR$/report_sunac.iml" /> <change beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_core_2_6_1.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/web/ReportController.java" afterPath="$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/web/ReportController.java" /> <change beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_spi_2_6_1.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/ejweb/modules/workbench/Bean/WorkbenchBean.java" afterPath="$PROJECT_DIR$/src/main/java/com/ejweb/modules/workbench/Bean/WorkbenchBean.java" /> <change beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_spring_web_2_6_1.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/ejweb/modules/workbench/service/WorkbenchService.java" afterPath="$PROJECT_DIR$/src/main/java/com/ejweb/modules/workbench/service/WorkbenchService.java" /> <change beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_swagger_ui_2_6_1.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/ejweb/modules/workbench/web/WorkbenchController.java" afterPath="$PROJECT_DIR$/src/main/java/com/ejweb/modules/workbench/web/WorkbenchController.java" /> <change beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_swagger_swagger_annotations_1_5_16.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/resources/mappings/modules/report/ReportDao.xml" afterPath="$PROJECT_DIR$/src/main/resources/mappings/modules/report/ReportDao.xml" /> <change beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__jfree_jcommon_1_0_16.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report/reportDetail.jsp" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report/reportDetail.jsp" /> <change beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__jfree_jfreechart_1_0_13.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report/reportList.jsp" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report/reportList.jsp" /> <change beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_core_1_2_0_RELEASE.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/workbench/workbench.jsp" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/workbench/workbench.jsp" /> <change beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_metadata_1_2_0_RELEASE.xml" />
<change beforePath="" afterPath="$PROJECT_DIR$/.idea/vcs.xml" />
<change beforePath="" afterPath="$PROJECT_DIR$/.idea/webContexts.xml" />
<change beforePath="" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/lib/ojdbc14.jar" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change beforePath="$PROJECT_DIR$/report_sunac.iml" afterPath="$PROJECT_DIR$/report_sunac.iml" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/entity/ReportEntity.java" afterPath="$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/entity/ReportEntity.java" />
<change beforePath="$PROJECT_DIR$/target/report_sunac/META-INF/MANIFEST.MF" afterPath="$PROJECT_DIR$/target/report_sunac/META-INF/MANIFEST.MF" />
<change beforePath="$PROJECT_DIR$/target/report_sunac/WEB-INF/ckfinder.xml" afterPath="$PROJECT_DIR$/target/report_sunac/WEB-INF/ckfinder.xml" />
<change beforePath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/WEB-INF/ckfinder.xml" afterPath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/WEB-INF/ckfinder.xml" />
<change beforePath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/WEB-INF/classes/WEB-INF/ckfinder.xml" afterPath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/WEB-INF/classes/WEB-INF/ckfinder.xml" />
<change beforePath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/WEB-INF/classes/WEB-INF/classes/ejweb.properties" afterPath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/WEB-INF/classes/WEB-INF/classes/ejweb.properties" />
<change beforePath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/WEB-INF/classes/WEB-INF/classes/spring-mvc.xml" afterPath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/WEB-INF/classes/WEB-INF/classes/spring-mvc.xml" />
<change beforePath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/WEB-INF/classes/WEB-INF/tags/sys/validateCode.tag" afterPath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/WEB-INF/classes/WEB-INF/tags/sys/validateCode.tag" />
<change beforePath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/WEB-INF/classes/WEB-INF/views/modules/sys/menuTree.jsp" afterPath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/WEB-INF/classes/WEB-INF/views/modules/sys/menuTree.jsp" />
<change beforePath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/WEB-INF/classes/WEB-INF/views/modules/sys/sysIndex.jsp" afterPath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/WEB-INF/classes/WEB-INF/views/modules/sys/sysIndex.jsp" />
<change beforePath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/WEB-INF/classes/WEB-INF/views/modules/sys/sysIndex2.jsp" afterPath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/WEB-INF/classes/WEB-INF/views/modules/sys/sysIndex2.jsp" />
<change beforePath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/WEB-INF/classes/WEB-INF/views/modules/sys/sysLogin.jsp" afterPath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/WEB-INF/classes/WEB-INF/views/modules/sys/sysLogin.jsp" />
<change beforePath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/WEB-INF/classes/WEB-INF/views/modules/sys/userForm.jsp" afterPath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/WEB-INF/classes/WEB-INF/views/modules/sys/userForm.jsp" />
<change beforePath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/WEB-INF/classes/WEB-INF/web.xml" afterPath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/WEB-INF/classes/WEB-INF/web.xml" />
<change beforePath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/WEB-INF/classes/ejweb.properties" afterPath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/WEB-INF/classes/ejweb.properties" />
<change beforePath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/WEB-INF/classes/jdbc.properties" afterPath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/WEB-INF/classes/jdbc.properties" />
<change beforePath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/WEB-INF/classes/mappings/modules/sys/AreaDao.xml" afterPath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/WEB-INF/classes/mappings/modules/sys/AreaDao.xml" />
<change beforePath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/WEB-INF/classes/mappings/modules/sys/DictDao.xml" afterPath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/WEB-INF/classes/mappings/modules/sys/DictDao.xml" />
<change beforePath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/WEB-INF/classes/mappings/modules/sys/LogDao.xml" afterPath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/WEB-INF/classes/mappings/modules/sys/LogDao.xml" />
<change beforePath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/WEB-INF/classes/mappings/modules/sys/MenuDao.xml" afterPath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/WEB-INF/classes/mappings/modules/sys/MenuDao.xml" />
<change beforePath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/WEB-INF/classes/mappings/modules/sys/OfficeDao.xml" afterPath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/WEB-INF/classes/mappings/modules/sys/OfficeDao.xml" />
<change beforePath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/WEB-INF/classes/mappings/modules/sys/RoleDao.xml" afterPath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/WEB-INF/classes/mappings/modules/sys/RoleDao.xml" />
<change beforePath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/WEB-INF/classes/mappings/modules/sys/UserDao.xml" afterPath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/WEB-INF/classes/mappings/modules/sys/UserDao.xml" />
<change beforePath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/WEB-INF/classes/mappings/modules/upload/UploadDao.xml" afterPath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/WEB-INF/classes/mappings/modules/upload/UploadDao.xml" />
<change beforePath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/WEB-INF/classes/spring-mvc.xml" afterPath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/WEB-INF/classes/spring-mvc.xml" />
<change beforePath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/WEB-INF/tags/sys/validateCode.tag" afterPath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/WEB-INF/tags/sys/validateCode.tag" />
<change beforePath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/WEB-INF/views/modules/sys/menuTree.jsp" afterPath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/WEB-INF/views/modules/sys/menuTree.jsp" />
<change beforePath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/WEB-INF/views/modules/sys/sysIndex.jsp" afterPath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/WEB-INF/views/modules/sys/sysIndex.jsp" />
<change beforePath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/WEB-INF/views/modules/sys/sysIndex2.jsp" afterPath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/WEB-INF/views/modules/sys/sysIndex2.jsp" />
<change beforePath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/WEB-INF/views/modules/sys/sysLogin.jsp" afterPath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/WEB-INF/views/modules/sys/sysLogin.jsp" />
<change beforePath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/WEB-INF/views/modules/sys/userForm.jsp" afterPath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/WEB-INF/views/modules/sys/userForm.jsp" />
<change beforePath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/WEB-INF/web.xml" afterPath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/WEB-INF/web.xml" />
<change beforePath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/com/ejweb/conf/ErrorCode.class" afterPath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/com/ejweb/conf/ErrorCode.class" />
<change beforePath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/com/ejweb/conf/GConstants.class" afterPath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/com/ejweb/conf/GConstants.class" />
<change beforePath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/com/ejweb/core/base/BaseEntity.class" afterPath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/com/ejweb/core/base/BaseEntity.class" />
<change beforePath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/com/ejweb/core/base/FindEntity.class" afterPath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/com/ejweb/core/base/FindEntity.class" />
<change beforePath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/com/ejweb/core/service/BaseService.class" afterPath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/com/ejweb/core/service/BaseService.class" />
<change beforePath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/com/ejweb/core/utils/excel/ExportExcel$1.class" afterPath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/com/ejweb/core/utils/excel/ExportExcel$1.class" />
<change beforePath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/com/ejweb/core/utils/excel/ExportExcel.class" afterPath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/com/ejweb/core/utils/excel/ExportExcel.class" />
<change beforePath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/com/ejweb/core/web/CKFinderConfig.class" afterPath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/com/ejweb/core/web/CKFinderConfig.class" />
<change beforePath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/com/ejweb/core/web/CKFinderConnectorServlet.class" afterPath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/com/ejweb/core/web/CKFinderConnectorServlet.class" />
<change beforePath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/com/ejweb/modules/sys/entity/Office.class" afterPath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/com/ejweb/modules/sys/entity/Office.class" />
<change beforePath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/com/ejweb/modules/sys/entity/User.class" afterPath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/com/ejweb/modules/sys/entity/User.class" />
<change beforePath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/com/ejweb/modules/sys/service/SystemService.class" afterPath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/com/ejweb/modules/sys/service/SystemService.class" />
<change beforePath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/com/ejweb/modules/sys/web/LoginController.class" afterPath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/com/ejweb/modules/sys/web/LoginController.class" />
<change beforePath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/com/ejweb/modules/sys/web/MenuController.class" afterPath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/com/ejweb/modules/sys/web/MenuController.class" />
<change beforePath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/ejweb.properties" afterPath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/ejweb.properties" />
<change beforePath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/jdbc.properties" afterPath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/jdbc.properties" />
<change beforePath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/mappings/modules/sys/AreaDao.xml" afterPath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/mappings/modules/sys/AreaDao.xml" />
<change beforePath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/mappings/modules/sys/DictDao.xml" afterPath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/mappings/modules/sys/DictDao.xml" />
<change beforePath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/mappings/modules/sys/LogDao.xml" afterPath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/mappings/modules/sys/LogDao.xml" />
<change beforePath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/mappings/modules/sys/MenuDao.xml" afterPath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/mappings/modules/sys/MenuDao.xml" />
<change beforePath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/mappings/modules/sys/OfficeDao.xml" afterPath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/mappings/modules/sys/OfficeDao.xml" />
<change beforePath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/mappings/modules/sys/RoleDao.xml" afterPath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/mappings/modules/sys/RoleDao.xml" />
<change beforePath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/mappings/modules/sys/UserDao.xml" afterPath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/mappings/modules/sys/UserDao.xml" />
<change beforePath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/mappings/modules/upload/UploadDao.xml" afterPath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/mappings/modules/upload/UploadDao.xml" />
<change beforePath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/spring-mvc.xml" afterPath="$PROJECT_DIR$/target/report_sunac/WEB-INF/classes/spring-mvc.xml" />
<change beforePath="$PROJECT_DIR$/target/report_sunac/WEB-INF/tags/sys/validateCode.tag" afterPath="$PROJECT_DIR$/target/report_sunac/WEB-INF/tags/sys/validateCode.tag" />
<change beforePath="$PROJECT_DIR$/target/report_sunac/WEB-INF/views/modules/sys/menuTree.jsp" afterPath="$PROJECT_DIR$/target/report_sunac/WEB-INF/views/modules/sys/menuTree.jsp" />
<change beforePath="$PROJECT_DIR$/target/report_sunac/WEB-INF/views/modules/sys/sysIndex.jsp" afterPath="$PROJECT_DIR$/target/report_sunac/WEB-INF/views/modules/sys/sysIndex.jsp" />
<change beforePath="$PROJECT_DIR$/target/report_sunac/WEB-INF/views/modules/sys/sysIndex2.jsp" afterPath="$PROJECT_DIR$/target/report_sunac/WEB-INF/views/modules/sys/sysIndex2.jsp" />
<change beforePath="$PROJECT_DIR$/target/report_sunac/WEB-INF/views/modules/sys/sysLogin.jsp" afterPath="$PROJECT_DIR$/target/report_sunac/WEB-INF/views/modules/sys/sysLogin.jsp" />
<change beforePath="$PROJECT_DIR$/target/report_sunac/WEB-INF/views/modules/sys/userForm.jsp" afterPath="$PROJECT_DIR$/target/report_sunac/WEB-INF/views/modules/sys/userForm.jsp" />
<change beforePath="$PROJECT_DIR$/target/report_sunac/WEB-INF/web.xml" afterPath="$PROJECT_DIR$/target/report_sunac/WEB-INF/web.xml" />
</list> </list>
<ignored path="it-faq-manage.iws" /> <ignored path="it-faq-manage.iws" />
<ignored path=".idea/workspace.xml" /> <ignored path=".idea/workspace.xml" />
...@@ -49,79 +119,42 @@ ...@@ -49,79 +119,42 @@
<favorites_list name="it-faq-manage" /> <favorites_list name="it-faq-manage" />
</component> </component>
<component name="FileEditorManager"> <component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> <leaf SIDE_TABS_SIZE_LIMIT_KEY="375">
<file leaf-file-name="WorkbenchController.java" pinned="false" current-in-tab="false"> <file leaf-file-name="reportTrack.jsp" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/workbench/web/WorkbenchController.java"> <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report/reportTrack.jsp">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="49"> <state relative-caret-position="437">
<caret line="99" column="0" lean-forward="false" selection-start-line="99" selection-start-column="0" selection-end-line="99" selection-end-column="0" /> <caret line="85" column="13" lean-forward="false" selection-start-line="85" selection-start-column="13" selection-end-line="85" selection-end-column="13" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="WorkbenchService.java" pinned="false" current-in-tab="false"> <file leaf-file-name="reportDetail.jsp" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/workbench/service/WorkbenchService.java"> <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report/reportDetail.jsp">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-2607"> <state relative-caret-position="391">
<caret line="21" column="13" lean-forward="false" selection-start-line="21" selection-start-column="13" selection-end-line="21" selection-end-column="13" /> <caret line="173" column="50" lean-forward="true" selection-start-line="173" selection-start-column="50" selection-end-line="173" selection-end-column="50" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="ReportDao.xml" pinned="false" current-in-tab="false"> <file leaf-file-name="ReportController.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/resources/mappings/modules/report/ReportDao.xml"> <entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/web/ReportController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="462">
<caret line="14" column="42" lean-forward="false" selection-start-line="14" selection-start-column="42" selection-end-line="14" selection-end-column="42" />
<folding>
<marker date="1510543225981" expanded="true" signature="1713:1817" ph="SELECT FROM ct_bbtc_report" />
<marker date="1510543225981" expanded="true" signature="1923:5269" ph="SELECT FROM ct_bbtc_report" />
<marker date="1510543225981" expanded="true" signature="5822:6047" ph="SELECT sr.na... ct_bbtc_sys_role" />
<marker date="1510543225981" expanded="true" signature="6143:6338" ph="SELECT ra.at... ct_bbtc_report_attachment" />
<marker date="1510543225981" expanded="true" signature="6390:7304" ph="INSERT INTO ct_bbtc_report... " />
<marker date="1510543225981" expanded="true" signature="7366:7706" ph="INSERT INTO ct_bbtc_report_attachment... " />
<marker date="1510543225981" expanded="true" signature="7753:8418" ph="UPDATE ct_bb... " />
<marker date="1510543225981" expanded="true" signature="8479:8569" ph="UPDATE ct_bb... " />
<marker date="1510543225981" expanded="true" signature="8660:11593" ph="SELECT su.id... ct_bbtc_sys_user" />
<marker date="1510543225981" expanded="true" signature="11692:12068" ph="SELECT so.id... ct_bbtc_sys_office" />
<marker date="1510543225981" expanded="true" signature="11775:11840" ph="SELECT s.nam... ct_bbtc_sys_office" />
<marker date="1510543225981" expanded="true" signature="11919:11984" ph="SELECT s.nam... ct_bbtc_sys_office" />
<marker date="1510543225981" expanded="true" signature="12145:12263" ph="SELECT so.id... ct_bbtc_sys_office" />
<marker date="1510543225981" expanded="true" signature="12343:12454" ph="SELECT posit... ct_bbtc_sys_position" />
<marker date="1510543225981" expanded="true" signature="12512:13002" ph="INSERT INTO ct_bbtc_report_notice... " />
<marker date="1510543225981" expanded="true" signature="13063:13484" ph="UPDATE ct_bb... " />
<marker date="1510543225981" expanded="true" signature="13604:13781" ph="SELECT * FRO... ct_bbtc_report_notice" />
<marker date="1510543225981" expanded="true" signature="13876:14214" ph="SELECT su.id... ct_bbtc_sys_user" />
<marker date="1510543225981" expanded="true" signature="14271:14587" ph="INSERT INTO ct_bbtc_report_exchange_his... " />
<marker date="1510543225981" expanded="true" signature="14739:15462" ph="select repor... ct_bbtc_report" />
<marker date="1510543225981" expanded="true" signature="15614:16345" ph="select deal_... ct_bbtc_report" />
<marker date="1510543225981" expanded="true" signature="16490:17213" ph="select repor... ct_bbtc_report" />
<marker date="1510543225981" expanded="true" signature="19668:21773" ph="SELECT r.id ct_bbtc_report" />
<marker date="1510543225981" expanded="true" signature="21959:23151" ph="SELECT r.id ct_bbtc_report" />
<marker date="1510543225981" expanded="true" signature="22549:22613" ph="SELECT name ct_bbtc_sys_user" />
<marker date="1510543225981" expanded="true" signature="23212:23427" ph="UPDATE ct_bb... " />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="ReportToPdfController.java" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/web/ReportToPdfController.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="264"> <state relative-caret-position="345">
<caret line="8" column="0" lean-forward="false" selection-start-line="8" selection-start-column="0" selection-end-line="8" selection-end-column="0" /> <caret line="320" column="70" lean-forward="false" selection-start-line="320" selection-start-column="70" selection-end-line="320" selection-end-column="70" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="pom.xml" pinned="false" current-in-tab="false"> <file leaf-file-name="ReportEntity.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pom.xml"> <entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/entity/ReportEntity.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-20010"> <state relative-caret-position="529">
<caret line="6" column="27" lean-forward="false" selection-start-line="6" selection-start-column="27" selection-end-line="6" selection-end-column="27" /> <caret line="47" column="0" lean-forward="false" selection-start-line="47" selection-start-column="0" selection-end-line="47" selection-end-column="0" />
<folding /> <folding />
</state> </state>
</provider> </provider>
...@@ -131,15 +164,6 @@ ...@@ -131,15 +164,6 @@
</component> </component>
<component name="FindInProjectRecents"> <component name="FindInProjectRecents">
<findStrings> <findStrings>
<find>加载ejweb.properties成功</find>
<find>${db.table.prefix}sys_</find>
<find>from</find>
<find />
<find>sys_</find>
<find>gen_table</find>
<find>IT小助手管理</find>
<find>IT</find>
<find>I</find>
<find>小助手</find> <find>小助手</find>
<find>\u5c0f\u52a9\u624b</find> <find>\u5c0f\u52a9\u624b</find>
<find>getByLoginName</find> <find>getByLoginName</find>
...@@ -160,7 +184,16 @@ ...@@ -160,7 +184,16 @@
<find>error_log</find> <find>error_log</find>
<find>error_logs</find> <find>error_logs</find>
<find>BaseEntity</find> <find>BaseEntity</find>
<find>BaseEntity</find> <find>举报受理</find>
<find>meanWhile</find>
<find>answer</find>
<find>addT</find>
<find>addTrack</find>
<find>请选择</find>
<find>举报</find>
<find>lin</find>
<find>showDone</find>
<find>dealResult</find>
</findStrings> </findStrings>
<replaceStrings> <replaceStrings>
<replace>${db.table.prefix}</replace> <replace>${db.table.prefix}</replace>
...@@ -183,13 +216,12 @@ ...@@ -183,13 +216,12 @@
<projects_view /> <projects_view />
</option> </option>
</component> </component>
<component name="HighlightingSettingsPerFile">
<setting file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report/reportTrack.jsp" root0="FORCE_HIGHLIGHTING" root1="FORCE_HIGHLIGHTING" root2="FORCE_HIGHLIGHTING" />
</component>
<component name="IdeDocumentHistory"> <component name="IdeDocumentHistory">
<option name="CHANGED_PATHS"> <option name="CHANGED_PATHS">
<list> <list>
<option value="$PROJECT_DIR$/src/main/java/com/ejweb/modules/faq/service/FaqService.java" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/faq/faqList.jsp" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/sys/menuTree.jsp" />
<option value="$PROJECT_DIR$/src/main/webapp/assets/bootstrap/2.3.1/css_default/bootstrap.css" />
<option value="$PROJECT_DIR$/src/main/java/com/ejweb/modules/ask/dao/AskDao.java" /> <option value="$PROJECT_DIR$/src/main/java/com/ejweb/modules/ask/dao/AskDao.java" />
<option value="$PROJECT_DIR$/src/main/java/com/ejweb/modules/ask/entity/AskEntity.java" /> <option value="$PROJECT_DIR$/src/main/java/com/ejweb/modules/ask/entity/AskEntity.java" />
<option value="$PROJECT_DIR$/src/main/java/com/ejweb/modules/ask/entity/AskListEntity.java" /> <option value="$PROJECT_DIR$/src/main/java/com/ejweb/modules/ask/entity/AskListEntity.java" />
...@@ -237,6 +269,10 @@ ...@@ -237,6 +269,10 @@
<option value="$PROJECT_DIR$/src/main/java/com/ejweb/core/base/BaseEntity.java" /> <option value="$PROJECT_DIR$/src/main/java/com/ejweb/core/base/BaseEntity.java" />
<option value="$PROJECT_DIR$/src/main/resources/mappings/modules/sys/UserDao.xml" /> <option value="$PROJECT_DIR$/src/main/resources/mappings/modules/sys/UserDao.xml" />
<option value="$PROJECT_DIR$/src/main/resources/jdbc.properties" /> <option value="$PROJECT_DIR$/src/main/resources/jdbc.properties" />
<option value="$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/entity/ReportEntity.java" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report/reportDetail.jsp" />
<option value="$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/web/ReportController.java" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report/reportTrack.jsp" />
</list> </list>
</option> </option>
</component> </component>
...@@ -256,8 +292,8 @@ ...@@ -256,8 +292,8 @@
<component name="MavenImportPreferences"> <component name="MavenImportPreferences">
<option name="generalSettings"> <option name="generalSettings">
<MavenGeneralSettings> <MavenGeneralSettings>
<option name="mavenHome" value="C:/Program Files/apache-maven-3.3.9" /> <option name="mavenHome" value="D:/maven/apache-maven-3.5.2" />
<option name="userSettingsFile" value="C:\Program Files\apache-maven-3.3.9\conf\settings.xml" /> <option name="userSettingsFile" value="D:\maven\apache-maven-3.5.2\conf\settings.xml" />
</MavenGeneralSettings> </MavenGeneralSettings>
</option> </option>
<option name="importingSettings"> <option name="importingSettings">
...@@ -280,9 +316,9 @@ ...@@ -280,9 +316,9 @@
</PATH> </PATH>
</treeState> </treeState>
</component> </component>
<component name="ProjectFrameBounds"> <component name="ProjectFrameBounds" extendedState="6">
<option name="x" value="-8" /> <option name="x" value="-9" />
<option name="y" value="-8" /> <option name="y" value="-9" />
<option name="width" value="1320" /> <option name="width" value="1320" />
<option name="height" value="784" /> <option name="height" value="784" />
</component> </component>
...@@ -297,17 +333,17 @@ ...@@ -297,17 +333,17 @@
<showLibraryContents /> <showLibraryContents />
<hideEmptyPackages /> <hideEmptyPackages />
<abbreviatePackageNames /> <abbreviatePackageNames />
<autoscrollToSource /> <autoscrollToSource ProjectPane="false" />
<autoscrollFromSource /> <autoscrollFromSource ProjectPane="false" />
<sortByType /> <sortByType />
<manualOrder /> <manualOrder />
<foldersAlwaysOnTop value="true" /> <foldersAlwaysOnTop value="true" />
</navigator> </navigator>
<panes> <panes>
<pane id="Scratches" /> <pane id="AndroidView" />
<pane id="Scope" /> <pane id="Scope" />
<pane id="Scratches" />
<pane id="PackagesPane" /> <pane id="PackagesPane" />
<pane id="AndroidView" />
<pane id="ProjectPane"> <pane id="ProjectPane">
<subPane> <subPane>
<expand> <expand>
...@@ -369,7 +405,7 @@ ...@@ -369,7 +405,7 @@
<item name="com" type="462c0819:PsiDirectoryNode" /> <item name="com" type="462c0819:PsiDirectoryNode" />
<item name="ejweb" type="462c0819:PsiDirectoryNode" /> <item name="ejweb" type="462c0819:PsiDirectoryNode" />
<item name="modules" type="462c0819:PsiDirectoryNode" /> <item name="modules" type="462c0819:PsiDirectoryNode" />
<item name="workbench" type="462c0819:PsiDirectoryNode" /> <item name="report" type="462c0819:PsiDirectoryNode" />
</path> </path>
<path> <path>
<item name="sunac_report" type="b2602c69:ProjectViewProjectNode" /> <item name="sunac_report" type="b2602c69:ProjectViewProjectNode" />
...@@ -380,43 +416,41 @@ ...@@ -380,43 +416,41 @@
<item name="com" type="462c0819:PsiDirectoryNode" /> <item name="com" type="462c0819:PsiDirectoryNode" />
<item name="ejweb" type="462c0819:PsiDirectoryNode" /> <item name="ejweb" type="462c0819:PsiDirectoryNode" />
<item name="modules" type="462c0819:PsiDirectoryNode" /> <item name="modules" type="462c0819:PsiDirectoryNode" />
<item name="workbench" type="462c0819:PsiDirectoryNode" /> <item name="report" type="462c0819:PsiDirectoryNode" />
<item name="service" type="462c0819:PsiDirectoryNode" /> <item name="web" type="462c0819:PsiDirectoryNode" />
</path> </path>
<path> <path>
<item name="sunac_report" type="b2602c69:ProjectViewProjectNode" /> <item name="sunac_report" type="b2602c69:ProjectViewProjectNode" />
<item name="sunac_report" type="462c0819:PsiDirectoryNode" /> <item name="sunac_report" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" /> <item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" /> <item name="main" type="462c0819:PsiDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" /> <item name="webapp" type="462c0819:PsiDirectoryNode" />
<item name="com" type="462c0819:PsiDirectoryNode" />
<item name="ejweb" type="462c0819:PsiDirectoryNode" />
<item name="modules" type="462c0819:PsiDirectoryNode" />
<item name="workbench" type="462c0819:PsiDirectoryNode" />
<item name="web" type="462c0819:PsiDirectoryNode" />
</path> </path>
<path> <path>
<item name="sunac_report" type="b2602c69:ProjectViewProjectNode" /> <item name="sunac_report" type="b2602c69:ProjectViewProjectNode" />
<item name="sunac_report" type="462c0819:PsiDirectoryNode" /> <item name="sunac_report" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" /> <item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" /> <item name="main" type="462c0819:PsiDirectoryNode" />
<item name="resources" type="462c0819:PsiDirectoryNode" /> <item name="webapp" type="462c0819:PsiDirectoryNode" />
<item name="WEB-INF" type="462c0819:PsiDirectoryNode" />
</path> </path>
<path> <path>
<item name="sunac_report" type="b2602c69:ProjectViewProjectNode" /> <item name="sunac_report" type="b2602c69:ProjectViewProjectNode" />
<item name="sunac_report" type="462c0819:PsiDirectoryNode" /> <item name="sunac_report" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" /> <item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" /> <item name="main" type="462c0819:PsiDirectoryNode" />
<item name="resources" type="462c0819:PsiDirectoryNode" /> <item name="webapp" type="462c0819:PsiDirectoryNode" />
<item name="mappings" type="462c0819:PsiDirectoryNode" /> <item name="WEB-INF" type="462c0819:PsiDirectoryNode" />
<item name="views" type="462c0819:PsiDirectoryNode" />
</path> </path>
<path> <path>
<item name="sunac_report" type="b2602c69:ProjectViewProjectNode" /> <item name="sunac_report" type="b2602c69:ProjectViewProjectNode" />
<item name="sunac_report" type="462c0819:PsiDirectoryNode" /> <item name="sunac_report" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" /> <item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" /> <item name="main" type="462c0819:PsiDirectoryNode" />
<item name="resources" type="462c0819:PsiDirectoryNode" /> <item name="webapp" type="462c0819:PsiDirectoryNode" />
<item name="mappings" type="462c0819:PsiDirectoryNode" /> <item name="WEB-INF" type="462c0819:PsiDirectoryNode" />
<item name="views" type="462c0819:PsiDirectoryNode" />
<item name="modules" type="462c0819:PsiDirectoryNode" /> <item name="modules" type="462c0819:PsiDirectoryNode" />
</path> </path>
<path> <path>
...@@ -424,11 +458,23 @@ ...@@ -424,11 +458,23 @@
<item name="sunac_report" type="462c0819:PsiDirectoryNode" /> <item name="sunac_report" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" /> <item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" /> <item name="main" type="462c0819:PsiDirectoryNode" />
<item name="resources" type="462c0819:PsiDirectoryNode" /> <item name="webapp" type="462c0819:PsiDirectoryNode" />
<item name="mappings" type="462c0819:PsiDirectoryNode" /> <item name="WEB-INF" type="462c0819:PsiDirectoryNode" />
<item name="views" type="462c0819:PsiDirectoryNode" />
<item name="modules" type="462c0819:PsiDirectoryNode" /> <item name="modules" type="462c0819:PsiDirectoryNode" />
<item name="report" type="462c0819:PsiDirectoryNode" /> <item name="report" type="462c0819:PsiDirectoryNode" />
</path> </path>
<path>
<item name="sunac_report" type="b2602c69:ProjectViewProjectNode" />
<item name="sunac_report" type="462c0819:PsiDirectoryNode" />
<item name="target" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="sunac_report" type="b2602c69:ProjectViewProjectNode" />
<item name="sunac_report" type="462c0819:PsiDirectoryNode" />
<item name="target" type="462c0819:PsiDirectoryNode" />
<item name="report_sunac" type="462c0819:PsiDirectoryNode" />
</path>
</expand> </expand>
<select /> <select />
</subPane> </subPane>
...@@ -438,7 +484,7 @@ ...@@ -438,7 +484,7 @@
<component name="PropertiesComponent"> <component name="PropertiesComponent">
<property name="aspect.path.notification.shown" value="true" /> <property name="aspect.path.notification.shown" value="true" />
<property name="WebServerToolWindowFactoryState" value="false" /> <property name="WebServerToolWindowFactoryState" value="false" />
<property name="settings.editor.selected.configurable" value="MavenSettings" /> <property name="settings.editor.selected.configurable" value="configurable.group.language" />
<property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth0" value="255" /> <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth0" value="255" />
<property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder0" value="0" /> <property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder0" value="0" />
<property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth1" value="269" /> <property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth1" value="269" />
...@@ -455,18 +501,14 @@ ...@@ -455,18 +501,14 @@
<property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder2" value="2" /> <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder2" value="2" />
<property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth3" value="1036" /> <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth3" value="1036" />
<property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder3" value="3" /> <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder3" value="3" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/../ejweb-manage" /> <property name="last_opened_file_path" value="$PROJECT_DIR$/.." />
<property name="project.structure.last.edited" value="Modules" /> <property name="project.structure.last.edited" value="Modules" />
<property name="project.structure.proportion" value="0.15" /> <property name="project.structure.proportion" value="0.15" />
<property name="project.structure.side.proportion" value="0.2" /> <property name="project.structure.side.proportion" value="0.2" />
</component> </component>
<component name="RecentsManager"> <component name="RecentsManager">
<key name="CopyFile.RECENT_KEYS"> <key name="MoveFile.RECENT_KEYS">
<recent name="D:\IdeaProjects\it-faq-manage\src\main\webapp\assets\common" />
<recent name="D:\IdeaProjects\it-faq-manage\src\main\resources" />
<recent name="D:\IdeaProjects\it-faq-manage\src\main\webapp\assets\bootstrap\2.3.1\css_default" />
<recent name="D:\IdeaProjects\it-faq-manage\src\main\webapp\assets\images" /> <recent name="D:\IdeaProjects\it-faq-manage\src\main\webapp\assets\images" />
<recent name="D:\IdeaProjects\it-faq-manage\src\main\java\com\ejweb\core" />
</key> </key>
<key name="CopyClassDialog.RECENTS_KEY"> <key name="CopyClassDialog.RECENTS_KEY">
<recent name="com.ejweb.conf" /> <recent name="com.ejweb.conf" />
...@@ -474,7 +516,11 @@ ...@@ -474,7 +516,11 @@
<recent name="com.ejweb.core.filter" /> <recent name="com.ejweb.core.filter" />
<recent name="com.ejweb.core.base" /> <recent name="com.ejweb.core.base" />
</key> </key>
<key name="MoveFile.RECENT_KEYS"> <key name="CopyFile.RECENT_KEYS">
<recent name="D:\ideaProjects\sunac_report\src\main\webapp\WEB-INF\lib" />
<recent name="D:\IdeaProjects\it-faq-manage\src\main\webapp\assets\common" />
<recent name="D:\IdeaProjects\it-faq-manage\src\main\resources" />
<recent name="D:\IdeaProjects\it-faq-manage\src\main\webapp\assets\bootstrap\2.3.1\css_default" />
<recent name="D:\IdeaProjects\it-faq-manage\src\main\webapp\assets\images" /> <recent name="D:\IdeaProjects\it-faq-manage\src\main\webapp\assets\images" />
</key> </key>
</component> </component>
...@@ -490,80 +536,7 @@ ...@@ -490,80 +536,7 @@
</list> </list>
</option> </option>
</component> </component>
<component name="RunManager" selected="Tomcat Server.Tomcat 7.0"> <component name="RunManager">
<configuration name="Tomcat 7.0" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 7.0.68" ALTERNATIVE_JRE_ENABLED="true" ALTERNATIVE_JRE_PATH="1.8">
<option name="OPEN_IN_BROWSER_URL" value="http://localhost:8080/admin/login" />
<option name="UPDATING_POLICY" value="restart-server" />
<deployment>
<artifact name="report_sunac:war exploded">
<settings>
<option name="CONTEXT_PATH" value="/" />
</settings>
</artifact>
</deployment>
<server-settings>
<option name="BASE_DIRECTORY_NAME" value="Unnamed_report-sunac" />
</server-settings>
<predefined_log_file id="Tomcat" enabled="true" />
<predefined_log_file id="Tomcat Catalina" enabled="true" />
<predefined_log_file id="Tomcat Manager" enabled="false" />
<predefined_log_file id="Tomcat Host Manager" enabled="false" />
<predefined_log_file id="Tomcat Localhost Access" enabled="false" />
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
<RunnerSettings RunnerId="Debug">
<option name="DEBUG_PORT" value="53835" />
</RunnerSettings>
<ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Cover">
<option name="USE_ENV_VARIABLES" value="true" />
<STARTUP>
<option name="USE_DEFAULT" value="true" />
<option name="SCRIPT" value="" />
<option name="VM_PARAMETERS" value="" />
<option name="PROGRAM_PARAMETERS" value="" />
</STARTUP>
<SHUTDOWN>
<option name="USE_DEFAULT" value="true" />
<option name="SCRIPT" value="" />
<option name="VM_PARAMETERS" value="" />
<option name="PROGRAM_PARAMETERS" value="" />
</SHUTDOWN>
</ConfigurationWrapper>
<ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Debug">
<option name="USE_ENV_VARIABLES" value="true" />
<STARTUP>
<option name="USE_DEFAULT" value="true" />
<option name="SCRIPT" value="" />
<option name="VM_PARAMETERS" value="" />
<option name="PROGRAM_PARAMETERS" value="" />
</STARTUP>
<SHUTDOWN>
<option name="USE_DEFAULT" value="true" />
<option name="SCRIPT" value="" />
<option name="VM_PARAMETERS" value="" />
<option name="PROGRAM_PARAMETERS" value="" />
</SHUTDOWN>
</ConfigurationWrapper>
<ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Run">
<option name="USE_ENV_VARIABLES" value="true" />
<STARTUP>
<option name="USE_DEFAULT" value="true" />
<option name="SCRIPT" value="" />
<option name="VM_PARAMETERS" value="" />
<option name="PROGRAM_PARAMETERS" value="" />
</STARTUP>
<SHUTDOWN>
<option name="USE_DEFAULT" value="true" />
<option name="SCRIPT" value="" />
<option name="VM_PARAMETERS" value="" />
<option name="PROGRAM_PARAMETERS" value="" />
</SHUTDOWN>
</ConfigurationWrapper>
<method>
<option name="BuildArtifacts" enabled="true">
<artifact name="report_sunac:war exploded" />
</option>
</method>
</configuration>
<configuration default="true" type="Applet" factoryName="Applet"> <configuration default="true" type="Applet" factoryName="Applet">
<option name="HTML_USED" value="false" /> <option name="HTML_USED" value="false" />
<option name="WIDTH" value="400" /> <option name="WIDTH" value="400" />
...@@ -594,14 +567,6 @@ ...@@ -594,14 +567,6 @@
<setting name="depsClasspath" value="false" /> <setting name="depsClasspath" value="false" />
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" /> <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
</configuration> </configuration>
<configuration default="true" type="js.build_tools.gulp" factoryName="Gulp.js">
<node-interpreter>project</node-interpreter>
<node-options />
<gulpfile />
<tasks />
<arguments />
<envs />
</configuration>
<configuration default="true" type="JUnit" factoryName="JUnit"> <configuration default="true" type="JUnit" factoryName="JUnit">
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" /> <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
<module name="" /> <module name="" />
...@@ -634,12 +599,6 @@ ...@@ -634,12 +599,6 @@
<module name="it-faq-manage" /> <module name="it-faq-manage" />
<envs /> <envs />
</configuration> </configuration>
<configuration default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
<module name="" />
<option name="VM_PARAMETERS" value="-Xmx512m -Xms256m -XX:MaxPermSize=250m -ea" />
<option name="PROGRAM_PARAMETERS" />
<predefined_log_file id="idea.log" enabled="true" />
</configuration>
<configuration default="true" type="Remote" factoryName="Remote"> <configuration default="true" type="Remote" factoryName="Remote">
<option name="USE_SOCKET_TRANSPORT" value="true" /> <option name="USE_SOCKET_TRANSPORT" value="true" />
<option name="SERVER_MODE" value="false" /> <option name="SERVER_MODE" value="false" />
...@@ -674,6 +633,182 @@ ...@@ -674,6 +633,182 @@
<properties /> <properties />
<listeners /> <listeners />
</configuration> </configuration>
<configuration name="Unnamed" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 7.0.68" ALTERNATIVE_JRE_ENABLED="true" ALTERNATIVE_JRE_PATH="1.8">
<option name="OPEN_IN_BROWSER_URL" value="http://localhost:8080/sunac/admin/login" />
<option name="BROWSER_ID" value="a7bb68e0-33c0-4d6f-a81a-aac1fdb870c8" />
<deployment>
<artifact name="report_sunac:war exploded">
<settings>
<option name="CONTEXT_PATH" value="/sunac" />
</settings>
</artifact>
</deployment>
<server-settings>
<option name="BASE_DIRECTORY_NAME" value="Unnamed_sunac_report_2" />
</server-settings>
<predefined_log_file id="Tomcat" enabled="true" />
<predefined_log_file id="Tomcat Catalina" enabled="true" />
<predefined_log_file id="Tomcat Manager" enabled="false" />
<predefined_log_file id="Tomcat Host Manager" enabled="false" />
<predefined_log_file id="Tomcat Localhost Access" enabled="false" />
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
<RunnerSettings RunnerId="Debug">
<option name="DEBUG_PORT" value="60239" />
</RunnerSettings>
<ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Cover">
<option name="USE_ENV_VARIABLES" value="true" />
<STARTUP>
<option name="USE_DEFAULT" value="true" />
<option name="SCRIPT" value="" />
<option name="VM_PARAMETERS" value="" />
<option name="PROGRAM_PARAMETERS" value="" />
</STARTUP>
<SHUTDOWN>
<option name="USE_DEFAULT" value="true" />
<option name="SCRIPT" value="" />
<option name="VM_PARAMETERS" value="" />
<option name="PROGRAM_PARAMETERS" value="" />
</SHUTDOWN>
</ConfigurationWrapper>
<ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Debug">
<option name="USE_ENV_VARIABLES" value="true" />
<STARTUP>
<option name="USE_DEFAULT" value="true" />
<option name="SCRIPT" value="" />
<option name="VM_PARAMETERS" value="" />
<option name="PROGRAM_PARAMETERS" value="" />
</STARTUP>
<SHUTDOWN>
<option name="USE_DEFAULT" value="true" />
<option name="SCRIPT" value="" />
<option name="VM_PARAMETERS" value="" />
<option name="PROGRAM_PARAMETERS" value="" />
</SHUTDOWN>
</ConfigurationWrapper>
<ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Run">
<option name="USE_ENV_VARIABLES" value="true" />
<STARTUP>
<option name="USE_DEFAULT" value="true" />
<option name="SCRIPT" value="" />
<option name="VM_PARAMETERS" value="" />
<option name="PROGRAM_PARAMETERS" value="" />
</STARTUP>
<SHUTDOWN>
<option name="USE_DEFAULT" value="true" />
<option name="SCRIPT" value="" />
<option name="VM_PARAMETERS" value="" />
<option name="PROGRAM_PARAMETERS" value="" />
</SHUTDOWN>
</ConfigurationWrapper>
</configuration>
<configuration default="true" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 7.0.68" ALTERNATIVE_JRE_ENABLED="false">
<option name="BROWSER_ID" value="a7bb68e0-33c0-4d6f-a81a-aac1fdb870c8" />
<deployment>
<artifact name="report_sunac:war exploded">
<settings>
<option name="CONTEXT_PATH" value="/sunac" />
</settings>
</artifact>
</deployment>
<server-settings>
<option name="BASE_DIRECTORY_NAME" value="_sunac_report" />
</server-settings>
<predefined_log_file id="Tomcat" enabled="true" />
<predefined_log_file id="Tomcat Catalina" enabled="true" />
<predefined_log_file id="Tomcat Manager" enabled="false" />
<predefined_log_file id="Tomcat Host Manager" enabled="false" />
<predefined_log_file id="Tomcat Localhost Access" enabled="false" />
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
<RunnerSettings RunnerId="Debug">
<option name="DEBUG_PORT" value="60239" />
</RunnerSettings>
<ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Cover">
<option name="USE_ENV_VARIABLES" value="true" />
<STARTUP>
<option name="USE_DEFAULT" value="true" />
<option name="SCRIPT" value="" />
<option name="VM_PARAMETERS" value="" />
<option name="PROGRAM_PARAMETERS" value="" />
</STARTUP>
<SHUTDOWN>
<option name="USE_DEFAULT" value="true" />
<option name="SCRIPT" value="" />
<option name="VM_PARAMETERS" value="" />
<option name="PROGRAM_PARAMETERS" value="" />
</SHUTDOWN>
</ConfigurationWrapper>
<ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Debug">
<option name="USE_ENV_VARIABLES" value="true" />
<STARTUP>
<option name="USE_DEFAULT" value="true" />
<option name="SCRIPT" value="" />
<option name="VM_PARAMETERS" value="" />
<option name="PROGRAM_PARAMETERS" value="" />
</STARTUP>
<SHUTDOWN>
<option name="USE_DEFAULT" value="true" />
<option name="SCRIPT" value="" />
<option name="VM_PARAMETERS" value="" />
<option name="PROGRAM_PARAMETERS" value="" />
</SHUTDOWN>
</ConfigurationWrapper>
<ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Run">
<option name="USE_ENV_VARIABLES" value="true" />
<STARTUP>
<option name="USE_DEFAULT" value="true" />
<option name="SCRIPT" value="" />
<option name="VM_PARAMETERS" value="" />
<option name="PROGRAM_PARAMETERS" value="" />
</STARTUP>
<SHUTDOWN>
<option name="USE_DEFAULT" value="true" />
<option name="SCRIPT" value="" />
<option name="VM_PARAMETERS" value="" />
<option name="PROGRAM_PARAMETERS" value="" />
</SHUTDOWN>
</ConfigurationWrapper>
<method>
<option name="Make" enabled="true" />
<option name="BuildArtifacts" enabled="true">
<artifact name="report_sunac:war exploded" />
<artifact name="report_sunac:war" />
</option>
</method>
</configuration>
<configuration default="true" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Remote" ALTERNATIVE_JRE_ENABLED="false">
<option name="LOCAL" value="false" />
<deployment />
<server-settings>
<data>
<option name="targets">
<list>
<WatchedTargetModelImpl>
<option name="name" value="CONTEXT_XML" />
<name>CONTEXT_XML</name>
</WatchedTargetModelImpl>
<StagingTargetModelImpl>
<option name="name" value="STAGING" />
<name>STAGING</name>
</StagingTargetModelImpl>
</list>
</option>
<option name="transportHostId" value="" />
<host-id />
</data>
</server-settings>
<predefined_log_file id="Tomcat" enabled="true" />
<predefined_log_file id="TOMCAT_LOCALHOST_LOG_ID" enabled="true" />
<RunnerSettings RunnerId="Debug">
<option name="DEBUG_PORT" value="60241" />
<option name="LOCAL" value="false" />
</RunnerSettings>
</configuration>
<configuration default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
<module name="" />
<option name="VM_PARAMETERS" value="-Xmx512m -Xms256m -XX:MaxPermSize=250m -ea" />
<option name="PROGRAM_PARAMETERS" />
<predefined_log_file id="idea.log" enabled="true" />
</configuration>
<configuration default="true" type="AndroidRunConfigurationType" factoryName="Android App"> <configuration default="true" type="AndroidRunConfigurationType" factoryName="Android App">
<module name="" /> <module name="" />
<option name="DEPLOY" value="true" /> <option name="DEPLOY" value="true" />
...@@ -971,17 +1106,6 @@ ...@@ -971,17 +1106,6 @@
<envs /> <envs />
<method /> <method />
</configuration> </configuration>
<configuration default="true" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" ALTERNATIVE_JRE_ENABLED="false">
<deployment />
<server-settings />
<predefined_log_file id="Tomcat" enabled="true" />
<predefined_log_file id="Tomcat Catalina" enabled="true" />
<predefined_log_file id="Tomcat Manager" enabled="false" />
<predefined_log_file id="Tomcat Host Manager" enabled="false" />
<predefined_log_file id="Tomcat Localhost Access" enabled="false" />
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
<method />
</configuration>
<configuration default="true" type="js.build_tools.npm" factoryName="npm"> <configuration default="true" type="js.build_tools.npm" factoryName="npm">
<command value="run" /> <command value="run" />
<scripts /> <scripts />
...@@ -995,6 +1119,14 @@ ...@@ -995,6 +1119,14 @@
<configuration default="true" type="osgi.bnd.run" factoryName="Test Launcher (JUnit)"> <configuration default="true" type="osgi.bnd.run" factoryName="Test Launcher (JUnit)">
<method /> <method />
</configuration> </configuration>
<configuration default="true" type="js.build_tools.gulp" factoryName="Gulp.js">
<node-interpreter>project</node-interpreter>
<node-options />
<gulpfile />
<tasks />
<arguments />
<envs />
</configuration>
</component> </component>
<component name="ShelveChangesManager" show_recycled="false"> <component name="ShelveChangesManager" show_recycled="false">
<option name="remove_strategy" value="false" /> <option name="remove_strategy" value="false" />
...@@ -1156,27 +1288,11 @@ ...@@ -1156,27 +1288,11 @@
<workItem from="1504670049508" duration="1298000" /> <workItem from="1504670049508" duration="1298000" />
<workItem from="1504676719362" duration="3670000" /> <workItem from="1504676719362" duration="3670000" />
<workItem from="1504680850264" duration="1871000" /> <workItem from="1504680850264" duration="1871000" />
</task> <workItem from="1515999245524" duration="10408000" />
<task id="LOCAL-00059" summary="texarea换行问题"> <workItem from="1516064222059" duration="1743000" />
<created>1498552394380</created> <workItem from="1516066042509" duration="22333000" />
<option name="number" value="00059" /> <workItem from="1516150983398" duration="2256000" />
<option name="presentableId" value="LOCAL-00059" /> <workItem from="1516156308544" duration="3841000" />
<option name="project" value="LOCAL" />
<updated>1498552394380</updated>
</task>
<task id="LOCAL-00060" summary="添加评价功能">
<created>1498618457764</created>
<option name="number" value="00060" />
<option name="presentableId" value="LOCAL-00060" />
<option name="project" value="LOCAL" />
<updated>1498618457766</updated>
</task>
<task id="LOCAL-00061" summary="用户列表按创建时间排序">
<created>1498618934712</created>
<option name="number" value="00061" />
<option name="presentableId" value="LOCAL-00061" />
<option name="project" value="LOCAL" />
<updated>1498618934712</updated>
</task> </task>
<task id="LOCAL-00062" summary="不能跳下一页bug"> <task id="LOCAL-00062" summary="不能跳下一页bug">
<created>1498620421107</created> <created>1498620421107</created>
...@@ -1500,11 +1616,32 @@ ...@@ -1500,11 +1616,32 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1501554319540</updated> <updated>1501554319540</updated>
</task> </task>
<option name="localTasksCounter" value="108" /> <task id="LOCAL-00108" summary="ReportController:修改发送消息方法。&#10;reportDetaol:添加dealResult=4为“举报属实”。&#10;reportTrack:修改举报属性个状态可见“是否完成”。">
<created>1516159533395</created>
<option name="number" value="00108" />
<option name="presentableId" value="LOCAL-00108" />
<option name="project" value="LOCAL" />
<updated>1516159533397</updated>
</task>
<task id="LOCAL-00109" summary="ReportController:修改发送消息方法。&#10;reportDetaol:添加dealResult=4为“举报属实”。&#10;reportTrack:修改举报属性个状态可见“是否完成”。">
<created>1516159619302</created>
<option name="number" value="00109" />
<option name="presentableId" value="LOCAL-00109" />
<option name="project" value="LOCAL" />
<updated>1516159619302</updated>
</task>
<task id="LOCAL-00110" summary="ReportController:修改发送消息方法。&#10;reportDetaol:添加dealResult=4为“举报属实”。&#10;reportTrack:修改举报属性个状态可见“是否完成”。">
<created>1516159852559</created>
<option name="number" value="00110" />
<option name="presentableId" value="LOCAL-00110" />
<option name="project" value="LOCAL" />
<updated>1516159852559</updated>
</task>
<option name="localTasksCounter" value="111" />
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="351508000" /> <option name="totallyTimeSpent" value="399319000" />
</component> </component>
<component name="TodoView"> <component name="TodoView">
<todo-panel id="selected-file"> <todo-panel id="selected-file">
...@@ -1516,100 +1653,46 @@ ...@@ -1516,100 +1653,46 @@
</todo-panel> </todo-panel>
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="-11" y="-11" width="1942" height="1042" extended-state="6" /> <frame x="-9" y="-9" width="1938" height="1048" extended-state="6" />
<layout> <layout>
<window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" show_stripe_button="true" weight="0.42089093" sideWeight="0.50555557" order="7" side_tool="true" content_ui="tabs" /> <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" show_stripe_button="true" weight="0.42041713" sideWeight="0.50555557" order="7" side_tool="true" content_ui="tabs" />
<window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32923076" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32923076" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
<window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32936507" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32936507" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" /> <window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32942432" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32942432" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" show_stripe_button="true" weight="0.56374806" sideWeight="0.49444443" order="3" side_tool="false" content_ui="tabs" /> <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" show_stripe_button="true" weight="0.5642151" sideWeight="0.49444443" order="3" side_tool="false" content_ui="tabs" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32936078" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32936078" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32660332" sideWeight="0.49444443" order="10" side_tool="false" content_ui="tabs" /> <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
<window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> <window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="13" side_tool="false" content_ui="tabs" />
<window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" /> <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
<window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" /> <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.29252437" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.5" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" /> <window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
<window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" /> <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" /> <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.13333334" sideWeight="0.47179487" order="0" side_tool="false" content_ui="combo" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.18790497" sideWeight="0.47179487" order="0" side_tool="false" content_ui="combo" /> <window_info id="Bean Validation" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32995737" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
<window_info id="Bean Validation" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32995737" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.24038461" sideWeight="0.52820516" order="6" side_tool="true" content_ui="tabs" />
<window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.24038461" sideWeight="0.52820516" order="4" side_tool="true" content_ui="tabs" /> <window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="true" content_ui="tabs" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> <window_info id="Nl-Palette" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Nl-Palette" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" show_stripe_button="true" weight="0.42089093" sideWeight="0.50555557" order="7" side_tool="true" content_ui="tabs" /> <window_info id="Properties" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
<window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32923076" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="3" side_tool="false" content_ui="combo" />
<window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32936507" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3276923" sideWeight="0.49444443" order="11" side_tool="false" content_ui="tabs" />
<window_info id="Properties" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
<window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
<window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32942432" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" show_stripe_button="true" weight="0.56374806" sideWeight="0.49444443" order="3" side_tool="false" content_ui="tabs" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32936078" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3276923" sideWeight="0.49444443" order="10" side_tool="false" content_ui="tabs" />
<window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" />
<window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" /> <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="false" weight="0.29252437" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" show_stripe_button="true" weight="0.26984128" sideWeight="0.47179487" order="0" side_tool="false" content_ui="combo" />
<window_info id="Bean Validation" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32995737" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.24038461" sideWeight="0.52820516" order="4" side_tool="true" content_ui="tabs" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.28878647" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.28878647" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="true" content_ui="tabs" />
</layout> </layout>
<layout-to-restore> </component>
<window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> <component name="TypeScriptGeneratedFilesManager">
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> <option name="version" value="1" />
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
<window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32959402" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
<window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32959402" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.35536295" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32936078" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32827735" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
<window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" />
<window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32719395" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.23557693" sideWeight="0.47826087" order="0" side_tool="false" content_ui="combo" />
<window_info id="Bean Validation" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.20362474" sideWeight="0.5217391" order="4" side_tool="true" content_ui="tabs" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.2892741" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="true" content_ui="tabs" />
</layout-to-restore>
</component> </component>
<component name="Vcs.Log.Tabs.Properties"> <component name="Vcs.Log.Tabs.Properties">
<option name="TAB_STATES"> <option name="TAB_STATES">
...@@ -1653,7 +1736,6 @@ ...@@ -1653,7 +1736,6 @@
<ignored-roots> <ignored-roots>
<path value="$PROJECT_DIR$" /> <path value="$PROJECT_DIR$" />
</ignored-roots> </ignored-roots>
<MESSAGE value="问题内容限制从500改成300" />
<MESSAGE value="解决完问题跳已解决" /> <MESSAGE value="解决完问题跳已解决" />
<MESSAGE value="注掉web端的同步用户" /> <MESSAGE value="注掉web端的同步用户" />
<MESSAGE value="还原同步用户" /> <MESSAGE value="还原同步用户" />
...@@ -1678,7 +1760,8 @@ ...@@ -1678,7 +1760,8 @@
<MESSAGE value="限制图片上传格式" /> <MESSAGE value="限制图片上传格式" />
<MESSAGE value="限制上传图片类型" /> <MESSAGE value="限制上传图片类型" />
<MESSAGE value="放开root的退出" /> <MESSAGE value="放开root的退出" />
<option name="LAST_COMMIT_MESSAGE" value="放开root的退出" /> <MESSAGE value="ReportController:修改发送消息方法。&#10;reportDetaol:添加dealResult=4为“举报属实”。&#10;reportTrack:修改举报属性个状态可见“是否完成”。" />
<option name="LAST_COMMIT_MESSAGE" value="ReportController:修改发送消息方法。&#10;reportDetaol:添加dealResult=4为“举报属实”。&#10;reportTrack:修改举报属性个状态可见“是否完成”。" />
</component> </component>
<component name="XDebuggerManager"> <component name="XDebuggerManager">
<breakpoint-manager> <breakpoint-manager>
...@@ -1693,7 +1776,7 @@ ...@@ -1693,7 +1776,7 @@
<breakpoints-dialog> <breakpoints-dialog>
<breakpoints-dialog /> <breakpoints-dialog />
</breakpoints-dialog> </breakpoints-dialog>
<option name="time" value="159" /> <option name="time" value="161" />
</breakpoint-manager> </breakpoint-manager>
<watches-manager /> <watches-manager />
</component> </component>
...@@ -1702,67 +1785,6 @@ ...@@ -1702,67 +1785,6 @@
<option name="FILTER_TARGETS" value="false" /> <option name="FILTER_TARGETS" value="false" />
</component> </component>
<component name="editorHistoryManager"> <component name="editorHistoryManager">
<entry file="jar://$MAVEN_REPOSITORY$/javax/servlet/servlet-api/2.5/servlet-api-2.5-sources.jar!/javax/servlet/http/HttpServletRequest.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="185">
<caret line="361" column="35" lean-forward="false" selection-start-line="361" selection-start-column="35" selection-end-line="361" selection-end-column="35" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/ask/entity/AskEntity.java" />
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/ask/web/AskController.java" />
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/ask/service/AskService.java" />
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/ask/entity/AskFileEntity.java" />
<entry file="file://$PROJECT_DIR$/doc/技术文档/配置_StatViewServlet配置 · alibaba_druid Wiki · GitHub.htm">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/doc/README.me">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="180">
<caret line="6" column="0" lean-forward="false" selection-start-line="6" selection-start-column="0" selection-end-line="6" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/sys/security/UsernamePasswordToken.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="240">
<caret line="10" column="13" lean-forward="false" selection-start-line="10" selection-start-column="13" selection-end-line="10" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/sys/security/FormAuthenticationFilter.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1830">
<caret line="86" column="15" lean-forward="false" selection-start-line="86" selection-start-column="15" selection-end-line="86" selection-end-column="15" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/ask/askList.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2610">
<caret line="87" column="11" lean-forward="false" selection-start-line="87" selection-start-column="11" selection-end-line="87" selection-end-column="11" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/faq/faqList.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="270">
<caret line="9" column="39" lean-forward="false" selection-start-line="9" selection-start-column="39" selection-end-line="9" selection-end-column="39" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/faq/api/FaqApi.java" />
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/core/utils/IdWorker.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="480">
<caret line="33" column="4" lean-forward="false" selection-start-line="33" selection-start-column="4" selection-end-line="33" selection-end-column="4" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/sys/security/SystemAuthorizingRealm.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/sys/security/SystemAuthorizingRealm.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1950"> <state relative-caret-position="1950">
...@@ -2227,26 +2249,122 @@ ...@@ -2227,26 +2249,122 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/pom.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-20010">
<caret line="6" column="27" lean-forward="false" selection-start-line="6" selection-start-column="27" selection-end-line="6" selection-end-column="27" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/resources/mappings/modules/reportAttachment/ReportAttachmentMapper.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-690">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/resources/mappings/modules/report/ReportDao.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-3036">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/resources/jdbc.properties"> <entry file="file://$PROJECT_DIR$/src/main/resources/jdbc.properties">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="200"> <state relative-caret-position="741">
<caret line="8" column="0" lean-forward="true" selection-start-line="8" selection-start-column="0" selection-end-line="8" selection-end-column="0" /> <caret line="43" column="22" lean-forward="true" selection-start-line="43" selection-start-column="22" selection-end-line="43" selection-end-column="22" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/service/ReportService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="281">
<caret line="287" column="89" lean-forward="true" selection-start-line="287" selection-start-column="89" selection-end-line="287" selection-end-column="89" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/dao/ReportDao.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="23">
<caret line="57" column="0" lean-forward="false" selection-start-line="57" selection-start-column="0" selection-end-line="57" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/web/ReportToPdfController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="277">
<caret line="342" column="41" lean-forward="false" selection-start-line="342" selection-start-column="41" selection-end-line="342" selection-end-column="41" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1795">
<caret line="168" column="0" lean-forward="true" selection-start-line="168" selection-start-column="0" selection-end-line="168" selection-end-column="0" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/pom.xml"> <entry file="file://$PROJECT_DIR$/target/report_sunac/WEB-INF/web.xml">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-20010"> <state relative-caret-position="-828">
<caret line="6" column="27" lean-forward="false" selection-start-line="6" selection-start-column="27" selection-end-line="6" selection-end-column="27" /> <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report/reportList.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-4709">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/web/ReportToPdfController.java"> <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report/reportForm.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-2829">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report/reportDeliver.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="438">
<caret line="315" column="19" lean-forward="true" selection-start-line="315" selection-start-column="19" selection-end-line="315" selection-end-column="19" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/entity/ReportEntity.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="529">
<caret line="47" column="0" lean-forward="false" selection-start-line="47" selection-start-column="0" selection-end-line="47" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report/reportTrack.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="437">
<caret line="85" column="13" lean-forward="false" selection-start-line="85" selection-start-column="13" selection-end-line="85" selection-end-column="13" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/report/web/ReportController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="345">
<caret line="320" column="70" lean-forward="false" selection-start-line="320" selection-start-column="70" selection-end-line="320" selection-end-column="70" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/modules/report/reportDetail.jsp">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="264"> <state relative-caret-position="391">
<caret line="8" column="0" lean-forward="false" selection-start-line="8" selection-start-column="0" selection-end-line="8" selection-end-column="0" /> <caret line="173" column="50" lean-forward="true" selection-start-line="173" selection-start-column="50" selection-end-line="173" selection-end-column="50" />
<folding /> <folding />
</state> </state>
</provider> </provider>
......
report_sunac.iml
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
<orderEntry type="module-library"> <orderEntry type="module-library">
<library name="Maven: com.alibaba:jconsole:1.8.0"> <library name="Maven: com.alibaba:jconsole:1.8.0">
<CLASSES> <CLASSES>
<root url="jar://D:/Java/jdk1.8.0_144/lib/jconsole.jar!/" /> <root url="jar://D:/Java/JDK/jdk1.8.0_131/lib/jconsole.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />
...@@ -72,7 +72,7 @@ ...@@ -72,7 +72,7 @@
<orderEntry type="module-library"> <orderEntry type="module-library">
<library name="Maven: com.alibaba:tools:1.8.0"> <library name="Maven: com.alibaba:tools:1.8.0">
<CLASSES> <CLASSES>
<root url="jar://D:/Java/jdk1.8.0_144/lib/tools.jar!/" /> <root url="jar://D:/Java/JDK/jdk1.8.0_131/lib/tools.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />
......
src/main/java/com/ejweb/modules/report/entity/ReportEntity.java
...@@ -32,7 +32,7 @@ public class ReportEntity extends DataEntity<ReportEntity> { ...@@ -32,7 +32,7 @@ public class ReportEntity extends DataEntity<ReportEntity> {
private String supplementProject; //被举报项目 private String supplementProject; //被举报项目
private String supplementContent; // private String supplementContent; //
private String dealPersonName; //处理人 private String dealPersonName; //处理人
private String dealResult; //处理结论 1 投诉 2 举报无效 3 举报属实 private String dealResult; //处理结论 1 投诉 2 举报无效 3 举报受理 4 举报属实
private String exchangeBeforeUser; //移交/转交前用户 private String exchangeBeforeUser; //移交/转交前用户
private String exchangeAfterUser; //移交/转交后用户（只记录最新的移交用户，此处不记录历史） private String exchangeAfterUser; //移交/转交后用户（只记录最新的移交用户，此处不记录历史）
private String exchangeType; //举报改变类型 1移交 2转交 private String exchangeType; //举报改变类型 1移交 2转交
......
target/report_sunac/META-INF/MANIFEST.MF
Manifest-Version: 1.0 Manifest-Version: 1.0
Built-By: 8023x Built-By: Dell
Created-By: IntelliJ IDEA Created-By: IntelliJ IDEA
Build-Jdk: 1.8.0_121 Build-Jdk: 1.8.0_131
target/report_sunac/WEB-INF/ckfinder.xml
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
<type name="files"> <type name="files">
<url>%BASE_URL%files/</url> <url>%BASE_URL%files/</url>
<directory>%BASE_DIR%files</directory> <directory>%BASE_DIR%files</directory>
<maxSize>5M</maxSize> <maxSize>50M</maxSize>
<allowedExtensions>7z,aiff,asf,avi,bmp,csv,doc,docx,fla,flv,gif,gz,gzip,jpeg,jpg,mid,mov,mp3,mp4,mpc,mpeg,mpg,ods,odt,pdf,png,ppt,pptx,pxd,qt,ram,rar,rm,rmi,rmvb,rtf,sdc,sitd,swf,sxc,sxw,tar,tgz,tif,tiff,txt,vsd,wav,wma,wmv,xls,xlsx,zip</allowedExtensions> <allowedExtensions>7z,aiff,asf,avi,bmp,csv,doc,docx,fla,flv,gif,gz,gzip,jpeg,jpg,mid,mov,mp3,mp4,mpc,mpeg,mpg,ods,odt,pdf,png,ppt,pptx,pxd,qt,ram,rar,rm,rmi,rmvb,rtf,sdc,sitd,swf,sxc,sxw,tar,tgz,tif,tiff,txt,vsd,wav,wma,wmv,xls,xlsx,zip</allowedExtensions>
<deniedExtensions></deniedExtensions> <deniedExtensions></deniedExtensions>
</type> </type>
......
target/report_sunac/WEB-INF/classes/WEB-INF/ckfinder.xml
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
<type name="files"> <type name="files">
<url>%BASE_URL%files/</url> <url>%BASE_URL%files/</url>
<directory>%BASE_DIR%files</directory> <directory>%BASE_DIR%files</directory>
<maxSize>5M</maxSize> <maxSize>50M</maxSize>
<allowedExtensions>7z,aiff,asf,avi,bmp,csv,doc,docx,fla,flv,gif,gz,gzip,jpeg,jpg,mid,mov,mp3,mp4,mpc,mpeg,mpg,ods,odt,pdf,png,ppt,pptx,pxd,qt,ram,rar,rm,rmi,rmvb,rtf,sdc,sitd,swf,sxc,sxw,tar,tgz,tif,tiff,txt,vsd,wav,wma,wmv,xls,xlsx,zip</allowedExtensions> <allowedExtensions>7z,aiff,asf,avi,bmp,csv,doc,docx,fla,flv,gif,gz,gzip,jpeg,jpg,mid,mov,mp3,mp4,mpc,mpeg,mpg,ods,odt,pdf,png,ppt,pptx,pxd,qt,ram,rar,rm,rmi,rmvb,rtf,sdc,sitd,swf,sxc,sxw,tar,tgz,tif,tiff,txt,vsd,wav,wma,wmv,xls,xlsx,zip</allowedExtensions>
<deniedExtensions></deniedExtensions> <deniedExtensions></deniedExtensions>
</type> </type>
......
target/report_sunac/WEB-INF/classes/WEB-INF/classes/WEB-INF/ckfinder.xml
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
<type name="files"> <type name="files">
<url>%BASE_URL%files/</url> <url>%BASE_URL%files/</url>
<directory>%BASE_DIR%files</directory> <directory>%BASE_DIR%files</directory>
<maxSize>5M</maxSize> <maxSize>50M</maxSize>
<allowedExtensions>7z,aiff,asf,avi,bmp,csv,doc,docx,fla,flv,gif,gz,gzip,jpeg,jpg,mid,mov,mp3,mp4,mpc,mpeg,mpg,ods,odt,pdf,png,ppt,pptx,pxd,qt,ram,rar,rm,rmi,rmvb,rtf,sdc,sitd,swf,sxc,sxw,tar,tgz,tif,tiff,txt,vsd,wav,wma,wmv,xls,xlsx,zip</allowedExtensions> <allowedExtensions>7z,aiff,asf,avi,bmp,csv,doc,docx,fla,flv,gif,gz,gzip,jpeg,jpg,mid,mov,mp3,mp4,mpc,mpeg,mpg,ods,odt,pdf,png,ppt,pptx,pxd,qt,ram,rar,rm,rmi,rmvb,rtf,sdc,sitd,swf,sxc,sxw,tar,tgz,tif,tiff,txt,vsd,wav,wma,wmv,xls,xlsx,zip</allowedExtensions>
<deniedExtensions></deniedExtensions> <deniedExtensions></deniedExtensions>
</type> </type>
......
target/report_sunac/WEB-INF/classes/WEB-INF/classes/WEB-INF/classes/ejweb.properties
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
#============================# #============================#
#\u4ea7\u54c1\u4fe1\u606f\u8bbe\u7f6e #\u4ea7\u54c1\u4fe1\u606f\u8bbe\u7f6e
productName=\u76d1\u5bdf\u4e3e\u62a5\u7ba1\u7406\u7cfb\u7edf productName=\u76d1\u5bdf\u5ba1\u8ba1\u7ba1\u7406\u7cfb\u7edf
copyrightYear=2017 copyrightYear=2017
version=V1.2.6 version=V1.2.6
...@@ -73,9 +73,10 @@ userfiles.prefix=static ...@@ -73,9 +73,10 @@ userfiles.prefix=static
#projectPath=D\:\\workspace\\jeesite #projectPath=D\:\\workspace\\jeesite
# The Upload File DIR, Must End With File Separator # The Upload File DIR, Must End With File Separator
## file.upload.dir=/mnt/yunbbc/ file.upload.dir=/home/static/report/
#file.upload.dir=/mnt/sunac/
## file.upload.dir=D:\\WorkSapce\\JEESpace\\ejweb-api-1.0\\files\\ ## file.upload.dir=D:\\WorkSapce\\JEESpace\\ejweb-api-1.0\\files\\
file.upload.dir=/D:/uploads/ #file.upload.dir=/D:/uploads/
# Max Upload File Size: (default 30M=30*1024*1024(B)=31457280 bytes) # Max Upload File Size: (default 30M=30*1024*1024(B)=31457280 bytes)
file.max.upload.size=31457280 file.max.upload.size=31457280
# The File Path Date Format(default yyyyMM) # The File Path Date Format(default yyyyMM)
...@@ -94,7 +95,15 @@ file.image.thumb.is.allow=true ...@@ -94,7 +95,15 @@ file.image.thumb.is.allow=true
file.image.thumb.width=640 file.image.thumb.width=640
file.image.thumb.height=640 file.image.thumb.height=640
# The Prefix Url # The Prefix Url
file.prefix.url=http://127.0.0.1:8080/static/ #file.prefix.url=http://123.56.146.81:8808/
#ڴ
#file.prefix.url=http://192.168.7.210:8081/
#ڴʽ
#file.prefix.url=http://192.168.2.62:8082/
file.prefix.url=http://221.239.118.251:8899/static/report/
# The Prefix separator
file.upload.path.separator = /
# The Push Server Config # The Push Server Config
push.server.url=http://123.56.146.81:1880/v1/ push.server.url=http://123.56.146.81:1880/v1/
......
target/report_sunac/WEB-INF/classes/WEB-INF/classes/WEB-INF/classes/spring-mvc.xml
...@@ -139,8 +139,8 @@ ...@@ -139,8 +139,8 @@
<!-- 支持Shiro对Controller的方法级AOP安全控制 end --> <!-- 支持Shiro对Controller的方法级AOP安全控制 end -->
<!-- 上传文件拦截，设置最大上传文件大小 10M=10*1024*1024(B)=10485760 bytes --> <!-- 上传文件拦截，设置最大上传文件大小 10M=10*1024*1024(B)=10485760 bytes -->
<bean id="multipartResolver" class="com.ejweb.core.filter.BaiduCommonsMultipartResolver"> <!--<bean id="multipartResolver" class="com.ejweb.core.filter.BaiduCommonsMultipartResolver">
<property name="maxUploadSize" value="${web.maxUploadSize}" /> <property name="maxUploadSize" value="${web.maxUploadSize}" />
</bean> </bean>-->
</beans> </beans>
\ No newline at end of file
target/report_sunac/WEB-INF/classes/WEB-INF/classes/WEB-INF/tags/sys/validateCode.tag
...@@ -5,5 +5,5 @@ ...@@ -5,5 +5,5 @@
<%@ attribute name="imageCssStyle" type="java.lang.String" required="false" description="验证码图片样式"%> <%@ attribute name="imageCssStyle" type="java.lang.String" required="false" description="验证码图片样式"%>
<%@ attribute name="buttonCssStyle" type="java.lang.String" required="false" description="看不清按钮样式"%> <%@ attribute name="buttonCssStyle" type="java.lang.String" required="false" description="看不清按钮样式"%>
<input type="text" id="${name}" name="${name}" maxlength="5" class="txt required" style="font-weight:bold;width:45px;${inputCssStyle}"/> <input type="text" id="${name}" name="${name}" maxlength="5" class="txt required" style="font-weight:bold;width:45px;${inputCssStyle}"/>
<img src="${pageContext.request.contextPath}/servlet/validateCodeServlet" onclick="$('.${name}Refresh').click();" class="mid ${name}" style="${imageCssStyle}"/> <img src="${pageContext.request.contextPath}/servlet/validateCodeServlet1" onclick="$('.${name}Refresh').click();" class="mid ${name}" style="${imageCssStyle}"/>
<a href="javascript:" onclick="$('.${name}').attr('src','${pageContext.request.contextPath}/servlet/validateCodeServlet?'+new Date().getTime());" class="mid ${name}Refresh" style="${buttonCssStyle}">看不清</a> <a href="javascript:" onclick="$('.${name}').attr('src','${pageContext.request.contextPath}/servlet/validateCodeServlet1?'+new Date().getTime());" class="mid ${name}Refresh" style="${buttonCssStyle}">看不清</a>
\ No newline at end of file \ No newline at end of file
target/report_sunac/WEB-INF/classes/WEB-INF/classes/WEB-INF/views/modules/sys/menuTree.jsp
...@@ -27,6 +27,14 @@ ...@@ -27,6 +27,14 @@
</script> </script>
</head> </head>
<body> --%> <body> --%>
<script type="text/javascript">
function showMessage() {
var result = "${result}";
if (result == "") {
$("#messageDiv").hide();
}
}
</script>
<div class="accordion" id="menu-${param.parentId}"> <div class="accordion" id="menu-${param.parentId}">
<c:set var="menuList" value="${fns:getMenuList()}"/><c:set var="firstMenu" value="true"/> <c:set var="menuList" value="${fns:getMenuList()}"/><c:set var="firstMenu" value="true"/>
<c:forEach items="${menuList}" var="menu" varStatus="idxStatus"> <c:forEach items="${menuList}" var="menu" varStatus="idxStatus">
...@@ -35,8 +43,14 @@ ...@@ -35,8 +43,14 @@
<c:if test="${(fns:getUser().admin && menu.id ne '81687207761300463255') || (!fns:getUser().admin)}"> <c:if test="${(fns:getUser().admin && menu.id ne '81687207761300463255') || (!fns:getUser().admin)}">
<!-- --> <!-- -->
<div class="accordion-group"> <div class="accordion-group">
<div class="accordion-heading"> <div class="accordion-heading" style="position:relative;"><div>
<a class="accordion-toggle" data-toggle="collapse" data-parent="#menu-${param.parentId}" data-href="#collapse-${menu.id}" href="#collapse-${menu.id}" title="${menu.remarks}"><i class="icon-chevron-${not empty firstMenu && firstMenu ? 'down' : 'right'}"></i>&nbsp;${menu.name}</a> <a class="accordion-toggle" data-toggle="collapse" data-parent="#menu-${param.parentId}" data-href="#collapse-${menu.id}" href="#collapse-${menu.id}" title="${menu.remarks}">
<i class="icon-chevron-${not empty firstMenu && firstMenu ? 'down' : 'right'}"></i>&nbsp;${menu.name}</a></div>
<c:if test="${menu.name eq '消息中心'}">
<div id="messageDiv" style="position:absolute;right:20px;top:10px;width:15px; height:15px; background-color:#F00; border-radius:25px;">
<span id="promptMessage" style="height:15px; line-height:15px; display:block; color:#FFF; text-align:center">${result}</span>
</div>
</c:if>
</div> </div>
<div id="collapse-${menu.id}" class="accordion-body collapse ${not empty firstMenu && firstMenu ? 'in' : ''}"> <div id="collapse-${menu.id}" class="accordion-body collapse ${not empty firstMenu && firstMenu ? 'in' : ''}">
<div class="accordion-inner"> <div class="accordion-inner">
...@@ -61,6 +75,8 @@ ...@@ -61,6 +75,8 @@
</div> </div>
</c:if> </c:if>
</c:if> </c:if>
</c:forEach></div><%-- </c:forEach></div>
<img hidden src="about:blank" onerror="showMessage();">
<%--
</body> </body>
</html> --%> </html> --%>
\ No newline at end of file
target/report_sunac/WEB-INF/classes/WEB-INF/classes/WEB-INF/views/modules/sys/sysIndex.jsp
...@@ -125,6 +125,23 @@ ...@@ -125,6 +125,23 @@
$(this).click(); $(this).click();
} }
}); });
$.ajax({
url: "${ctx}/notice/prompt",
dataType: "text",
traditional: true,//这里设置为true
cache: false,
success: function(result) { //登录成功后返回的数据
if (result != "") {
$("#prompt").text(result);
$("#message").show();
}else {
$("#message").hide();
}
},
error:function(){
alert("系统错误！");
}
});
}); });
// <c:if test="${tabmode eq '1'}"> 添加一个页签 // <c:if test="${tabmode eq '1'}"> 添加一个页签
function addTab($this, refresh){ function addTab($this, refresh){
...@@ -141,6 +158,15 @@ ...@@ -141,6 +158,15 @@
}).loadData(refresh); }).loadData(refresh);
return false; return false;
}// </c:if> }// </c:if>
function refreshPromt(result) {
if (result != "") {
$("#prompt").text(result);
$("#promptMessage").text(result);
}else {
$("#message").hide();
$("#messageDiv").hide();
}
}
</script> </script>
</head> </head>
<body> <body>
...@@ -164,7 +190,7 @@ ...@@ -164,7 +190,7 @@
<li><a href="${ctx}/sys/user/modifyPwd" target="mainFrame"><i class="icon-lock"></i>&nbsp; 修改密码</a></li> <li><a href="${ctx}/sys/user/modifyPwd" target="mainFrame"><i class="icon-lock"></i>&nbsp; 修改密码</a></li>
</ul>--%> </ul>--%>
</li> </li>
<c:if test="${fns:getUser().id eq '1'}"><li><a href="${ctx}/logout" title="退出登录">退出</a></li></c:if> <%--<c:if test="${fns:getUser().id eq '1'}"><li><a href="${ctx}/logout" title="退出登录">退出</a></li></c:if>--%>
<li>&nbsp;</li> <li>&nbsp;</li>
</ul> </ul>
<%-- <c:if test="${cookie.theme.value eq 'cerulean'}"> <%-- <c:if test="${cookie.theme.value eq 'cerulean'}">
...@@ -183,7 +209,12 @@ ...@@ -183,7 +209,12 @@
<c:if test="${menu.parent.id eq '1'&&menu.isShow eq '1'}"> <c:if test="${menu.parent.id eq '1'&&menu.isShow eq '1'}">
<li class="menu ${not empty firstMenu && firstMenu ? ' active' : ''}"> <li class="menu ${not empty firstMenu && firstMenu ? ' active' : ''}">
<c:if test="${empty menu.href}"> <c:if test="${empty menu.href}">
<a class="menu" href="javascript:" data-href="${ctx}/sys/menu/tree?parentId=${menu.id}" data-id="${menu.id}"><span>${menu.name}</span></a> <a class="menu" href="javascript:" data-href="${ctx}/sys/menu/tree?parentId=${menu.id}" data-id="${menu.id}"><div style="position:relative;"><div><span>${menu.name}</span></div>
<c:if test="${menu.name eq '工作台'}">
<div id="message" style="position:absolute;right:-10px;top:-10px;width:15px; height:15px; background-color:#F00; border-radius:25px;display:none;">
<span id="prompt" style="height:15px; line-height:15px; display:block; color:#FFF; text-align:center"></span>
</div>
</c:if></div></a>
</c:if> </c:if>
<c:if test="${not empty menu.href}"> <c:if test="${not empty menu.href}">
<a class="menu" href="${fn:indexOf(menu.href, '://') eq -1 ? ctx : ''}${menu.href}" data-id="${menu.id}" target="mainFrame"><span>${menu.name}</span></a> <a class="menu" href="${fn:indexOf(menu.href, '://') eq -1 ? ctx : ''}${menu.href}" data-id="${menu.id}" target="mainFrame"><span>${menu.name}</span></a>
......
target/report_sunac/WEB-INF/classes/WEB-INF/classes/WEB-INF/views/modules/sys/sysIndex2.jsp
...@@ -148,7 +148,7 @@ ...@@ -148,7 +148,7 @@
<li><a href="${ctx}/sys/user/modifyPwd" target="mainFrame"><i class="icon-lock"></i>&nbsp; 修改密码</a></li> <li><a href="${ctx}/sys/user/modifyPwd" target="mainFrame"><i class="icon-lock"></i>&nbsp; 修改密码</a></li>
</ul>--%> </ul>--%>
</li> </li>
<li><a href="${ctx}/logout" title="退出登录">退出</a></li> <li><%--<a href="${ctx}/logout" title="退出登录">退出</a>--%></li>
<li>&nbsp;</li> <li>&nbsp;</li>
</ul> </ul>
<%--<c:if test="${cookie.theme.value eq 'cerulean'}"> --%> <%--<c:if test="${cookie.theme.value eq 'cerulean'}"> --%>
......
target/report_sunac/WEB-INF/classes/WEB-INF/classes/WEB-INF/views/modules/sys/sysLogin.jsp
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
$(document).ready(function() { $(document).ready(function() {
$("#loginForm").validate({ $("#loginForm").validate({
rules: { rules: {
validateCode: {remote: "${pageContext.request.contextPath}/servlet/validateCodeServlet"} validateCode: {remote: "${pageContext.request.contextPath}/servlet/validateCodeServlet1"}
}, },
messages: { messages: {
username: {required: "请填写用户名."},password: {required: "请填写密码."}, username: {required: "请填写用户名."},password: {required: "请填写密码."},
......
target/report_sunac/WEB-INF/classes/WEB-INF/classes/WEB-INF/views/modules/sys/userForm.jsp
...@@ -40,13 +40,13 @@ ...@@ -40,13 +40,13 @@
<form:form id="inputForm" modelAttribute="user" action="${ctx}/sys/user/save" method="post" class="form-horizontal"> <form:form id="inputForm" modelAttribute="user" action="${ctx}/sys/user/save" method="post" class="form-horizontal">
<form:hidden path="id"/> <form:hidden path="id"/>
<sys:message content="${message}"/> <sys:message content="${message}"/>
<div class="control-group"> <%--<div class="control-group">
<label class="control-label">头像:</label> <label class="control-label">头像:</label>
<div class="controls"> <div class="controls">
<form:hidden id="nameImage" path="photo" htmlEscape="false" maxlength="255" class="input-xlarge"/> <form:hidden id="nameImage" path="photo" htmlEscape="false" maxlength="255" class="input-xlarge"/>
<sys:ckfinder input="nameImage" type="images" uploadPath="/photo" selectMultiple="false" maxWidth="100" maxHeight="100"/> <sys:ckfinder input="nameImage" type="images" uploadPath="/photo" selectMultiple="false" maxWidth="100" maxHeight="100"/>
</div> </div>
</div> </div>--%>
<%--<div class="control-group"> <%--<div class="control-group">
<label class="control-label">归属公司:</label> <label class="control-label">归属公司:</label>
<div class="controls"> <div class="controls">
...@@ -61,13 +61,13 @@ ...@@ -61,13 +61,13 @@
title="部门" url="/sys/office/treeData?type=2" notAllowSelectParent="true"/> title="部门" url="/sys/office/treeData?type=2" notAllowSelectParent="true"/>
</div> </div>
</div>--%> </div>--%>
<div class="control-group"> <%--<div class="control-group">
<label class="control-label">工号:</label> <label class="control-label">工号:</label>
<div class="controls"> <div class="controls">
<form:input path="no" htmlEscape="false" maxlength="50" class="required"/> <form:input path="no" htmlEscape="false" maxlength="50" class="required"/>
<span class="help-inline"><font color="red">*</font> </span> <span class="help-inline"><font color="red">*</font> </span>
</div> </div>
</div> </div>--%>
<div class="control-group"> <div class="control-group">
<label class="control-label">姓名:</label> <label class="control-label">姓名:</label>
<div class="controls"> <div class="controls">
...@@ -83,7 +83,7 @@ ...@@ -83,7 +83,7 @@
<span class="help-inline"><font color="red">*</font> </span> <span class="help-inline"><font color="red">*</font> </span>
</div> </div>
</div> </div>
<div class="control-group"> <%--<div class="control-group">
<label class="control-label">密码:</label> <label class="control-label">密码:</label>
<div class="controls"> <div class="controls">
<input id="newPassword" name="newPassword" type="password" value="" maxlength="50" minlength="3" class="${empty user.id?'required':''}"/> <input id="newPassword" name="newPassword" type="password" value="" maxlength="50" minlength="3" class="${empty user.id?'required':''}"/>
...@@ -124,7 +124,7 @@ ...@@ -124,7 +124,7 @@
</form:select> </form:select>
<span class="help-inline"><font color="red">*</font> “是”代表此账号允许登录，“否”则表示此账号不允许登录</span> <span class="help-inline"><font color="red">*</font> “是”代表此账号允许登录，“否”则表示此账号不允许登录</span>
</div> </div>
</div> </div>--%>
<%-- <div class="control-group"> <%-- <div class="control-group">
<label class="control-label">用户类型:</label> <label class="control-label">用户类型:</label>
<div class="controls"> <div class="controls">
...@@ -141,7 +141,7 @@ ...@@ -141,7 +141,7 @@
<span class="help-inline"><font color="red">*</font> </span> <span class="help-inline"><font color="red">*</font> </span>
</div> </div>
</div> </div>
<div class="control-group"> <%--<div class="control-group">
<label class="control-label">备注:</label> <label class="control-label">备注:</label>
<div class="controls"> <div class="controls">
<form:textarea path="remarks" htmlEscape="false" rows="3" maxlength="200" class="input-xlarge"/> <form:textarea path="remarks" htmlEscape="false" rows="3" maxlength="200" class="input-xlarge"/>
...@@ -160,7 +160,7 @@ ...@@ -160,7 +160,7 @@
<label class="lbl">IP: ${user.loginIp}&nbsp;&nbsp;&nbsp;&nbsp;时间：<fmt:formatDate value="${user.loginDate}" type="both" dateStyle="full"/></label> <label class="lbl">IP: ${user.loginIp}&nbsp;&nbsp;&nbsp;&nbsp;时间：<fmt:formatDate value="${user.loginDate}" type="both" dateStyle="full"/></label>
</div> </div>
</div> </div>
</c:if> </c:if>--%>
<div class="form-actions"> <div class="form-actions">
<shiro:hasPermission name="sys:user:edit"><input id="btnSubmit" class="btn btn-primary" type="submit" value="保 存"/>&nbsp;</shiro:hasPermission> <shiro:hasPermission name="sys:user:edit"><input id="btnSubmit" class="btn btn-primary" type="submit" value="保 存"/>&nbsp;</shiro:hasPermission>
<input id="btnCancel" class="btn" type="button" value="返 回" onclick="history.go(-1)"/> <input id="btnCancel" class="btn" type="button" value="返 回" onclick="history.go(-1)"/>
......
target/report_sunac/WEB-INF/classes/WEB-INF/classes/WEB-INF/web.xml
...@@ -131,6 +131,16 @@ ...@@ -131,6 +131,16 @@
<filter-name>FileUploadFilter</filter-name> <filter-name>FileUploadFilter</filter-name>
<url-pattern>/assets/ckfinder/core/connector/java/connector.java</url-pattern> <url-pattern>/assets/ckfinder/core/connector/java/connector.java</url-pattern>
</filter-mapping> </filter-mapping>
<filter>
<filter-name>CorsFilter</filter-name>
<filter-class>com.ejweb.core.filter.CORSFilter</filter-class>
</filter>
<filter-mapping>
<filter-name>CorsFilter</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
<servlet> <servlet>
<servlet-name>UserfilesDownloadServlet</servlet-name> <servlet-name>UserfilesDownloadServlet</servlet-name>
<servlet-class>com.ejweb.core.servlet.UserfilesDownloadServlet</servlet-class> <servlet-class>com.ejweb.core.servlet.UserfilesDownloadServlet</servlet-class>
...@@ -145,8 +155,28 @@ ...@@ -145,8 +155,28 @@
</servlet> </servlet>
<servlet-mapping> <servlet-mapping>
<servlet-name>ValidateCodeServlet</servlet-name> <servlet-name>ValidateCodeServlet</servlet-name>
<url-pattern>/servlet/validateCodeServlet</url-pattern> <url-pattern>/api/front/report/validateCodeServlet</url-pattern>
</servlet-mapping>
<servlet>
<servlet-name>ValidateCodeServlet1</servlet-name>
<servlet-class>com.ejweb.core.servlet.ValidateCodeServlet</servlet-class>
</servlet>
<servlet-mapping>
<servlet-name>ValidateCodeServlet1</servlet-name>
<url-pattern>/servlet/validateCodeServlet1</url-pattern>
</servlet-mapping>
<!--验证码-->
<servlet>
<servlet-name>captcha</servlet-name>
<servlet-class>com.ejweb.modules.front.report.servlet.CaptchaServlet</servlet-class>
</servlet>
<servlet-mapping>
<servlet-name>captcha</servlet-name>
<url-pattern>/api/front/report/captcha</url-pattern>
</servlet-mapping> </servlet-mapping>
<error-page> <error-page>
<error-code>500</error-code> <error-code>500</error-code>
<location>/WEB-INF/views/error/500.jsp</location> <location>/WEB-INF/views/error/500.jsp</location>
......
target/report_sunac/WEB-INF/classes/WEB-INF/classes/ejweb.properties
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
#============================# #============================#
#\u4ea7\u54c1\u4fe1\u606f\u8bbe\u7f6e #\u4ea7\u54c1\u4fe1\u606f\u8bbe\u7f6e
productName=\u76d1\u5bdf\u4e3e\u62a5\u7ba1\u7406\u7cfb\u7edf productName=\u76d1\u5bdf\u5ba1\u8ba1\u7ba1\u7406\u7cfb\u7edf
copyrightYear=2017 copyrightYear=2017
version=V1.2.6 version=V1.2.6
...@@ -73,9 +73,10 @@ userfiles.prefix=static ...@@ -73,9 +73,10 @@ userfiles.prefix=static
#projectPath=D\:\\workspace\\jeesite #projectPath=D\:\\workspace\\jeesite
# The Upload File DIR, Must End With File Separator # The Upload File DIR, Must End With File Separator
## file.upload.dir=/mnt/yunbbc/ file.upload.dir=/home/static/report/
#file.upload.dir=/mnt/sunac/
## file.upload.dir=D:\\WorkSapce\\JEESpace\\ejweb-api-1.0\\files\\ ## file.upload.dir=D:\\WorkSapce\\JEESpace\\ejweb-api-1.0\\files\\
file.upload.dir=/D:/uploads/ #file.upload.dir=/D:/uploads/
# Max Upload File Size: (default 30M=30*1024*1024(B)=31457280 bytes) # Max Upload File Size: (default 30M=30*1024*1024(B)=31457280 bytes)
file.max.upload.size=31457280 file.max.upload.size=31457280
# The File Path Date Format(default yyyyMM) # The File Path Date Format(default yyyyMM)
...@@ -94,7 +95,15 @@ file.image.thumb.is.allow=true ...@@ -94,7 +95,15 @@ file.image.thumb.is.allow=true
file.image.thumb.width=640 file.image.thumb.width=640
file.image.thumb.height=640 file.image.thumb.height=640
# The Prefix Url # The Prefix Url
file.prefix.url=http://127.0.0.1:8080/static/ #file.prefix.url=http://123.56.146.81:8808/
#ڴ
#file.prefix.url=http://192.168.7.210:8081/
#ڴʽ
#file.prefix.url=http://192.168.2.62:8082/
file.prefix.url=http://221.239.118.251:8899/static/report/
# The Prefix separator
file.upload.path.separator = /
# The Push Server Config # The Push Server Config
push.server.url=http://123.56.146.81:1880/v1/ push.server.url=http://123.56.146.81:1880/v1/
......
target/report_sunac/WEB-INF/classes/WEB-INF/classes/jdbc.properties
#MySQL Database Config(The All Config Is Must) #MySQL Database Config(The All Config Is Must)
db.table.prefix=sunac_ db.table.prefix=sunac_
jdbc.type=mysql
jdbc.driver.class=com.mysql.jdbc.Driver #jdbc.type=mysql
jdbc.url=jdbc:mysql://localhost:3306/report_sunac?useUnicode=true&characterEncoding=utf-8 #jdbc.driver.class=com.mysql.jdbc.Driver
jdbc.username=root #jdbc.url=jdbc:mysql://123.56.146.7:3306/sunac_report?useUnicode=true&characterEncoding=utf-8
jdbc.password=admin #jdbc.username=reportuser
#jdbc.password=$R@20$7
#融创测试数据库
jdbc.type=oracle
jdbc.driver.class=oracle.jdbc.driver.OracleDriver
jdbc.url=jdbc:oracle:thin:@192.168.2.53:1521:eas
jdbc.username=eas7531
jdbc.password=sunac
#正式数据库
#jdbc.type=oracle
#jdbc.driver.class=oracle.jdbc.driver.OracleDriver
#jdbc.url=jdbc:oracle:thin:@192.168.2.24:1521:eas
#jdbc.username= easdba
#jdbc.password= Sunac_1918
#初始化连接 #初始化连接
jdbc.initialSize=0 jdbc.initialSize=0
......
target/report_sunac/WEB-INF/classes/WEB-INF/classes/mappings/modules/sys/AreaDao.xml
...@@ -20,13 +20,13 @@ ...@@ -20,13 +20,13 @@
</sql> </sql>
<sql id="areaJoins"> <sql id="areaJoins">
LEFT JOIN sys_office p ON p.id = a.parent_id LEFT JOIN ct_bbtc_sys_office p ON p.id = a.parent_id
</sql> </sql>
<select id="get" resultType="Area"> <select id="get" resultType="Area">
SELECT SELECT
<include refid="areaColumns"/> <include refid="areaColumns"/>
FROM sys_area a FROM ct_bbtc_sys_area a
<include refid="areaJoins"/> <include refid="areaJoins"/>
WHERE a.id = #{id} WHERE a.id = #{id}
</select> </select>
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
<select id="findList" resultType="Area"> <select id="findList" resultType="Area">
SELECT SELECT
<include refid="areaColumns"/> <include refid="areaColumns"/>
FROM sys_area a FROM ct_bbtc_sys_area a
<include refid="areaJoins"/> <include refid="areaJoins"/>
WHERE a.del_flag = #{DEL_FLAG_NORMAL} WHERE a.del_flag = #{DEL_FLAG_NORMAL}
<!-- 数据范围过滤 --> <!-- 数据范围过滤 -->
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
<select id="findAllList" resultType="Area"> <select id="findAllList" resultType="Area">
SELECT SELECT
<include refid="areaColumns"/> <include refid="areaColumns"/>
FROM sys_area a FROM ct_bbtc_sys_area a
<include refid="areaJoins"/> <include refid="areaJoins"/>
WHERE a.del_flag = #{DEL_FLAG_NORMAL} WHERE a.del_flag = #{DEL_FLAG_NORMAL}
ORDER BY a.code ORDER BY a.code
...@@ -57,13 +57,13 @@ ...@@ -57,13 +57,13 @@
a.id, a.id,
a.parent_id AS "parent.id", a.parent_id AS "parent.id",
a.parent_ids a.parent_ids
FROM sys_area a FROM ct_bbtc_sys_area a
WHERE a.del_flag = #{DEL_FLAG_NORMAL} AND a.parent_ids LIKE #{parentIds} WHERE a.del_flag = #{DEL_FLAG_NORMAL} AND a.parent_ids LIKE #{parentIds}
ORDER BY a.code ORDER BY a.code
</select> </select>
<insert id="insert"> <insert id="insert">
INSERT INTO sys_area( INSERT INTO ct_bbtc_sys_area(
id, id,
parent_id, parent_id,
parent_ids, parent_ids,
...@@ -95,7 +95,7 @@ ...@@ -95,7 +95,7 @@
</insert> </insert>
<update id="update"> <update id="update">
UPDATE sys_area SET UPDATE ct_bbtc_sys_area SET
parent_id = #{parent.id}, parent_id = #{parent.id},
parent_ids = #{parentIds}, parent_ids = #{parentIds},
code = #{code}, code = #{code},
...@@ -109,14 +109,14 @@ ...@@ -109,14 +109,14 @@
</update> </update>
<update id="updateParentIds"> <update id="updateParentIds">
UPDATE sys_area SET UPDATE ct_bbtc_sys_area SET
parent_id = #{parent.id}, parent_id = #{parent.id},
parent_ids = #{parentIds} parent_ids = #{parentIds}
WHERE id = #{id} WHERE id = #{id}
</update> </update>
<update id="delete"> <update id="delete">
UPDATE sys_area SET UPDATE ct_bbtc_sys_area SET
del_flag = #{DEL_FLAG_DELETE} del_flag = #{DEL_FLAG_DELETE}
WHERE id = #{id} OR parent_ids LIKE WHERE id = #{id} OR parent_ids LIKE
<if test="dbName == 'oracle'">'%,'||#{id}||',%'</if> <if test="dbName == 'oracle'">'%,'||#{id}||',%'</if>
......
target/report_sunac/WEB-INF/classes/WEB-INF/classes/mappings/modules/sys/DictDao.xml
...@@ -5,14 +5,14 @@ ...@@ -5,14 +5,14 @@
<select id="get" resultType="Dict"> <select id="get" resultType="Dict">
SELECT SELECT
* *
FROM sys_dict FROM ct_bbtc_sys_dict
WHERE id = #{id} WHERE id = #{id}
</select> </select>
<select id="findList" resultType="Dict"> <select id="findList" resultType="Dict">
SELECT SELECT
* *
FROM sys_dict FROM ct_bbtc_sys_dict
WHERE del_flag = #{DEL_FLAG_NORMAL} WHERE del_flag = #{DEL_FLAG_NORMAL}
<if test="type != null and type != ''"> <if test="type != null and type != ''">
AND type = #{type} AND type = #{type}
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
<select id="findAllList" resultType="Dict"> <select id="findAllList" resultType="Dict">
SELECT SELECT
* *
FROM sys_dict FROM ct_bbtc_sys_dict
WHERE del_flag = #{DEL_FLAG_NORMAL} WHERE del_flag = #{DEL_FLAG_NORMAL}
ORDER BY type, sort, update_date DESC ORDER BY type, sort, update_date DESC
</select> </select>
...@@ -37,14 +37,14 @@ ...@@ -37,14 +37,14 @@
<select id="findTypeList" resultType="string"> <select id="findTypeList" resultType="string">
SELECT SELECT
type type
FROM sys_dict FROM ct_bbtc_sys_dict
WHERE del_flag = #{DEL_FLAG_NORMAL} WHERE del_flag = #{DEL_FLAG_NORMAL}
GROUP BY type GROUP BY type
ORDER BY type ORDER BY type
</select> </select>
<insert id="insert"> <insert id="insert">
INSERT INTO sys_dict( INSERT INTO ct_bbtc_sys_dict(
id, id,
value, value,
label, label,
...@@ -74,7 +74,7 @@ ...@@ -74,7 +74,7 @@
</insert> </insert>
<update id="update"> <update id="update">
UPDATE sys_dict SET UPDATE ct_bbtc_sys_dict SET
value = #{value}, value = #{value},
label = #{label}, label = #{label},
type = #{type}, type = #{type},
...@@ -87,7 +87,7 @@ ...@@ -87,7 +87,7 @@
</update> </update>
<update id="delete"> <update id="delete">
UPDATE sys_dict SET UPDATE ct_bbtc_sys_dict SET
del_flag = #{DEL_FLAG_DELETE} del_flag = #{DEL_FLAG_DELETE}
WHERE id = #{id} WHERE id = #{id}
</update> </update>
......
target/report_sunac/WEB-INF/classes/WEB-INF/classes/mappings/modules/sys/LogDao.xml
...@@ -9,10 +9,10 @@ ...@@ -9,10 +9,10 @@
u.name AS "createBy.name", u.name AS "createBy.name",
c.name AS "createBy.company.name", c.name AS "createBy.company.name",
o.name AS "createBy.office.name" o.name AS "createBy.office.name"
FROM sys_log a FROM ct_bbtc_sys_log a
LEFT JOIN sys_user u ON u.id = a.create_by LEFT JOIN ct_bbtc_sys_user u ON u.id = a.create_by
LEFT JOIN sys_office c ON c.id = u.company_id LEFT JOIN ct_bbtc_sys_office c ON c.id = u.company_id
LEFT JOIN sys_office o ON o.id = u.office_id LEFT JOIN ct_bbtc_sys_office o ON o.id = u.office_id
WHERE a.create_date BETWEEN #{beginDate} AND #{endDate} WHERE a.create_date BETWEEN #{beginDate} AND #{endDate}
<if test="title != null and title != ''"> <if test="title != null and title != ''">
AND a.title LIKE AND a.title LIKE
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
</select> </select>
<insert id="insert"> <insert id="insert">
INSERT INTO sys_log( INSERT INTO ct_bbtc_sys_log(
id, id,
type, type,
title, title,
......
target/report_sunac/WEB-INF/classes/WEB-INF/classes/mappings/modules/sys/MenuDao.xml
...@@ -23,14 +23,14 @@ ...@@ -23,14 +23,14 @@
</sql> </sql>
<sql id="menuJoins"> <sql id="menuJoins">
LEFT JOIN sys_menu p LEFT JOIN ct_bbtc_sys_menu p
ON p.id = a.parent_id ON p.id = a.parent_id
</sql> </sql>
<select id="get" resultType="Menu"> <select id="get" resultType="Menu">
SELECT SELECT
<include refid="menuColumns"/> <include refid="menuColumns"/>
FROM sys_menu a FROM ct_bbtc_sys_menu a
<include refid="menuJoins"/> <include refid="menuJoins"/>
WHERE a.id = #{id} WHERE a.id = #{id}
</select> </select>
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
<select id="findAllList" resultType="Menu"> <select id="findAllList" resultType="Menu">
SELECT SELECT
<include refid="menuColumns"/> <include refid="menuColumns"/>
FROM sys_menu a FROM ct_bbtc_sys_menu a
<include refid="menuJoins"/> <include refid="menuJoins"/>
WHERE a.del_flag = #{DEL_FLAG_NORMAL} WHERE a.del_flag = #{DEL_FLAG_NORMAL}
ORDER BY a.sort ORDER BY a.sort
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
a.id, a.id,
a.parent_id AS "parent.id", a.parent_id AS "parent.id",
a.parent_ids a.parent_ids
FROM sys_menu a FROM ct_bbtc_sys_menu a
WHERE a.del_flag = #{DEL_FLAG_NORMAL} AND a.parent_ids LIKE #{parentIds} WHERE a.del_flag = #{DEL_FLAG_NORMAL} AND a.parent_ids LIKE #{parentIds}
ORDER BY a.sort ORDER BY a.sort
</select> </select>
...@@ -57,18 +57,18 @@ ...@@ -57,18 +57,18 @@
<select id="findByUserId" resultType="Menu"> <select id="findByUserId" resultType="Menu">
SELECT DISTINCT SELECT DISTINCT
<include refid="menuColumns"/> <include refid="menuColumns"/>
FROM sys_menu a FROM ct_bbtc_sys_menu a
LEFT JOIN sys_menu p ON p.id = a.parent_id LEFT JOIN ct_bbtc_sys_menu p ON p.id = a.parent_id
JOIN sys_menu2role rm ON rm.menu_id = a.id JOIN ct_bbtc_sys_menu2role rm ON rm.menu_id = a.id
JOIN sys_role r ON r.id = rm.role_id AND r.useable='1' JOIN ct_bbtc_sys_role r ON r.id = rm.role_id AND r.useable='1'
JOIN sys_user2role ur ON ur.role_id = r.id JOIN ct_bbtc_sys_user2role ur ON ur.role_id = r.id
JOIN sys_user u ON u.id = ur.user_id AND u.id = #{userId} JOIN ct_bbtc_sys_user u ON u.id = ur.user_id AND u.id = #{userId}
WHERE a.del_flag = #{DEL_FLAG_NORMAL} AND r.del_flag = #{DEL_FLAG_NORMAL} AND u.del_flag = #{DEL_FLAG_NORMAL} WHERE a.del_flag = #{DEL_FLAG_NORMAL} AND r.del_flag = #{DEL_FLAG_NORMAL} AND u.del_flag = #{DEL_FLAG_NORMAL}
ORDER BY a.sort ORDER BY a.sort
</select> </select>
<insert id="insert"> <insert id="insert">
INSERT INTO sys_menu( INSERT INTO ct_bbtc_sys_menu(
id, id,
parent_id, parent_id,
parent_ids, parent_ids,
...@@ -106,7 +106,7 @@ ...@@ -106,7 +106,7 @@
</insert> </insert>
<update id="update"> <update id="update">
UPDATE sys_menu SET UPDATE ct_bbtc_sys_menu SET
parent_id = #{parent.id}, parent_id = #{parent.id},
parent_ids = #{parentIds}, parent_ids = #{parentIds},
name = #{name}, name = #{name},
...@@ -123,20 +123,20 @@ ...@@ -123,20 +123,20 @@
</update> </update>
<update id="updateParentIds"> <update id="updateParentIds">
UPDATE sys_menu SET UPDATE ct_bbtc_sys_menu SET
parent_id = #{parent.id}, parent_id = #{parent.id},
parent_ids = #{parentIds} parent_ids = #{parentIds}
WHERE id = #{id} WHERE id = #{id}
</update> </update>
<update id="updateSort"> <update id="updateSort">
UPDATE sys_menu SET UPDATE ct_bbtc_sys_menu SET
sort = #{sort} sort = #{sort}
WHERE id = #{id} WHERE id = #{id}
</update> </update>
<update id="delete"> <update id="delete">
UPDATE sys_menu SET UPDATE ct_bbtc_sys_menu SET
del_flag = #{DEL_FLAG_DELETE} del_flag = #{DEL_FLAG_DELETE}
WHERE id = #{id} OR parent_ids LIKE WHERE id = #{id} OR parent_ids LIKE
<if test="dbName == 'oracle'">'%,'||#{id}||',%'</if> <if test="dbName == 'oracle'">'%,'||#{id}||',%'</if>
......
target/report_sunac/WEB-INF/classes/WEB-INF/classes/mappings/modules/sys/OfficeDao.xml
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
a.primary_person AS "primaryPerson.id", a.primary_person AS "primaryPerson.id",
a.deputy_person AS "deputyPerson.id", a.deputy_person AS "deputyPerson.id",
p.name AS "parent.name", p.name AS "parent.name",
p.`code` AS "parent.code", p.code AS "parent.code",
ar.name AS "area.name", ar.name AS "area.name",
ar.parent_ids AS "area.parentIds", ar.parent_ids AS "area.parentIds",
pp.name AS "primaryPerson.name", pp.name AS "primaryPerson.name",
...@@ -37,16 +37,16 @@ ...@@ -37,16 +37,16 @@
</sql> </sql>
<sql id="officeJoins"> <sql id="officeJoins">
LEFT JOIN sys_office p ON p.id = a.parent_id LEFT JOIN ct_bbtc_sys_office p ON p.id = a.parent_id
LEFT JOIN sys_area ar ON ar.id = a.area_id LEFT JOIN ct_bbtc_sys_area ar ON ar.id = a.area_id
LEFT JOIN sys_user pp ON pp.id = a.primary_person LEFT JOIN ct_bbtc_sys_user pp ON pp.id = a.primary_person
LEFT JOIN sys_user dp ON dp.id = a.deputy_person LEFT JOIN ct_bbtc_sys_user dp ON dp.id = a.deputy_person
</sql> </sql>
<select id="get" resultType="Office"> <select id="get" resultType="Office">
SELECT SELECT
<include refid="officeColumns"/> <include refid="officeColumns"/>
FROM sys_office a FROM ct_bbtc_sys_office a
<include refid="officeJoins"/> <include refid="officeJoins"/>
WHERE a.id = #{id} WHERE a.id = #{id}
</select> </select>
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
<select id="findList" resultType="Office"> <select id="findList" resultType="Office">
SELECT SELECT
<include refid="officeColumns"/> <include refid="officeColumns"/>
FROM sys_office a FROM ct_bbtc_sys_office a
<include refid="officeJoins"/> <include refid="officeJoins"/>
WHERE a.del_flag = #{DEL_FLAG_NORMAL} WHERE a.del_flag = #{DEL_FLAG_NORMAL}
<!-- 数据范围过滤 --> <!-- 数据范围过滤 -->
...@@ -66,7 +66,7 @@ ...@@ -66,7 +66,7 @@
<select id="findAllList" resultType="Office"> <select id="findAllList" resultType="Office">
SELECT SELECT
<include refid="officeColumns"/> <include refid="officeColumns"/>
FROM sys_office a FROM ct_bbtc_sys_office a
<include refid="officeJoins"/> <include refid="officeJoins"/>
WHERE a.del_flag = #{DEL_FLAG_NORMAL} WHERE a.del_flag = #{DEL_FLAG_NORMAL}
ORDER BY a.code ORDER BY a.code
...@@ -75,7 +75,7 @@ ...@@ -75,7 +75,7 @@
<select id="findByParentIdsLike" resultType="Office"> <select id="findByParentIdsLike" resultType="Office">
SELECT SELECT
<include refid="officeColumns"/> <include refid="officeColumns"/>
FROM sys_office a FROM ct_bbtc_sys_office a
<include refid="officeJoins"/> <include refid="officeJoins"/>
WHERE a.del_flag = #{DEL_FLAG_NORMAL} AND a.parent_ids LIKE #{parentIds} WHERE a.del_flag = #{DEL_FLAG_NORMAL} AND a.parent_ids LIKE #{parentIds}
ORDER BY a.code ORDER BY a.code
...@@ -85,7 +85,7 @@ ...@@ -85,7 +85,7 @@
<select id="findByParentId" resultType="Office"> <select id="findByParentId" resultType="Office">
SELECT SELECT
<include refid="officeColumns"/> <include refid="officeColumns"/>
FROM sys_office a FROM ct_bbtc_sys_office a
<include refid="officeJoins"/> <include refid="officeJoins"/>
WHERE a.del_flag = #{DEL_FLAG_NORMAL} AND a.parent_id = #{parent.id} WHERE a.del_flag = #{DEL_FLAG_NORMAL} AND a.parent_id = #{parent.id}
ORDER BY a.code ORDER BY a.code
...@@ -94,22 +94,23 @@ ...@@ -94,22 +94,23 @@
<select id="findByOfficeName" resultType="Office"> <select id="findByOfficeName" resultType="Office">
SELECT SELECT
<include refid="officeColumns"/> <include refid="officeColumns"/>
FROM sys_office a FROM ct_bbtc_sys_office a
<include refid="officeJoins"/> <include refid="officeJoins"/>
WHERE a.del_flag = '0' AND a.name = #{officeName} WHERE a.del_flag = '0' AND a.name = #{officeName}
</select> </select>
<select id="getCompany" resultType="Office"> <select id="getCompany" parameterType="Office" resultType="Office">
SELECT SELECT
<include refid="officeColumns"/> <include refid="officeColumns"/>
FROM sys_office a FROM ct_bbtc_sys_office a
<include refid="officeJoins"/> <include refid="officeJoins"/>
WHERE a.del_flag = #{DEL_FLAG_NORMAL} AND a.parent_id='1' WHERE a.del_flag = #{DEL_FLAG_NORMAL} AND a.parent_id='1'
limit 1 <if test="dbName == 'oracle'"> AND rownum &lt;= 1</if>
<if test="dbName == 'mysql'"> limit 1</if>
</select> </select>
<insert id="insert"> <insert id="insert">
INSERT INTO sys_office( INSERT INTO ct_bbtc_sys_office(
id, id,
parent_id, parent_id,
parent_ids, parent_ids,
...@@ -163,7 +164,7 @@ ...@@ -163,7 +164,7 @@
</insert> </insert>
<update id="update"> <update id="update">
UPDATE sys_office SET UPDATE ct_bbtc_sys_office SET
parent_id = #{parent.id}, parent_id = #{parent.id},
parent_ids = #{parentIds}, parent_ids = #{parentIds},
area_id = #{area.id}, area_id = #{area.id},
...@@ -187,14 +188,14 @@ ...@@ -187,14 +188,14 @@
</update> </update>
<update id="updateParentIds"> <update id="updateParentIds">
UPDATE sys_office SET UPDATE ct_bbtc_sys_office SET
parent_id = #{parent.id}, parent_id = #{parent.id},
parent_ids = #{parentIds} parent_ids = #{parentIds}
WHERE id = #{id} WHERE id = #{id}
</update> </update>
<update id="delete"> <update id="delete">
UPDATE sys_office SET UPDATE ct_bbtc_sys_office SET
del_flag = #{DEL_FLAG_DELETE} del_flag = #{DEL_FLAG_DELETE}
WHERE id = #{id} OR parent_ids LIKE WHERE id = #{id} OR parent_ids LIKE
<if test="dbName == 'oracle'">'%,'||#{id}||',%'</if> <if test="dbName == 'oracle'">'%,'||#{id}||',%'</if>
......
target/report_sunac/WEB-INF/classes/WEB-INF/classes/mappings/modules/sys/RoleDao.xml
...@@ -62,16 +62,16 @@ ...@@ -62,16 +62,16 @@
uo.name AS "userList.office.name", --> uo.name AS "userList.office.name", -->
rm.menu_id AS "menuList.id", rm.menu_id AS "menuList.id",
ro.office_id AS "officeList.id" ro.office_id AS "officeList.id"
FROM sys_role a FROM ct_bbtc_sys_role a
LEFT JOIN sys_office o LEFT JOIN ct_bbtc_sys_office o
ON o.id = a.office_id<!-- ON o.id = a.office_id<!--
LEFT JOIN sys_user2role ur ON ur.role_id = a.id LEFT JOIN ct_bbtc_sys_user2role ur ON ur.role_id = a.id
LEFT JOIN sys_user u ON u.id = ur.user_id LEFT JOIN ct_bbtc_sys_user u ON u.id = ur.user_id
LEFT JOIN sys_office uc ON uc.id = u.company_id LEFT JOIN ct_bbtc_sys_office uc ON uc.id = u.company_id
LEFT JOIN sys_office uo ON uo.id = u.office_id --> LEFT JOIN ct_bbtc_sys_office uo ON uo.id = u.office_id -->
LEFT JOIN sys_menu2role rm LEFT JOIN ct_bbtc_sys_menu2role rm
ON rm.role_id = a.id ON rm.role_id = a.id
LEFT JOIN sys_office2role ro LEFT JOIN ct_bbtc_sys_office2role ro
ON ro.role_id = a.id ON ro.role_id = a.id
WHERE a.id = #{id} WHERE a.id = #{id}
</select> </select>
...@@ -79,16 +79,16 @@ ...@@ -79,16 +79,16 @@
<select id="getByName" resultType="Role"> <select id="getByName" resultType="Role">
SELECT SELECT
<include refid="roleColumns"/> <include refid="roleColumns"/>
FROM sys_role a FROM ct_bbtc_sys_role a
JOIN sys_office o ON o.id = a.office_id JOIN ct_bbtc_sys_office o ON o.id = a.office_id
WHERE a.name = #{name} AND a.del_flag = #{DEL_FLAG_NORMAL} WHERE a.name = #{name} AND a.del_flag = #{DEL_FLAG_NORMAL}
</select> </select>
<select id="getByEnname" resultType="Role"> <select id="getByEnname" resultType="Role">
SELECT SELECT
<include refid="roleColumns"/> <include refid="roleColumns"/>
FROM sys_role a FROM ct_bbtc_sys_role a
JOIN sys_office o ON o.id = a.office_id JOIN ct_bbtc_sys_office o ON o.id = a.office_id
WHERE a.enname = #{enname} AND a.del_flag = #{DEL_FLAG_NORMAL} WHERE a.enname = #{enname} AND a.del_flag = #{DEL_FLAG_NORMAL}
</select> </select>
...@@ -96,11 +96,11 @@ ...@@ -96,11 +96,11 @@
SELECT <!-- DISTINCT --> SELECT <!-- DISTINCT -->
<include refid="roleColumns"/>, <include refid="roleColumns"/>,
ro.office_id AS "officeList.id" ro.office_id AS "officeList.id"
FROM sys_role a FROM ct_bbtc_sys_role a
LEFT JOIN sys_office o ON o.id = a.office_id LEFT JOIN ct_bbtc_sys_office o ON o.id = a.office_id
LEFT JOIN sys_user2role ur ON ur.role_id = a.id LEFT JOIN ct_bbtc_sys_user2role ur ON ur.role_id = a.id
LEFT JOIN sys_user u ON u.id = ur.user_id LEFT JOIN ct_bbtc_sys_user u ON u.id = ur.user_id
LEFT JOIN sys_office2role ro ON ro.role_id = a.id LEFT JOIN ct_bbtc_sys_office2role ro ON ro.role_id = a.id
WHERE a.del_flag = #{DEL_FLAG_NORMAL} AND a.useable=#{useable} WHERE a.del_flag = #{DEL_FLAG_NORMAL} AND a.useable=#{useable}
<if test="user != null and user.id != null and user.id != ''"> <if test="user != null and user.id != null and user.id != ''">
AND u.id = #{user.id} AND u.id = #{user.id}
...@@ -116,8 +116,8 @@ ...@@ -116,8 +116,8 @@
<select id="findAllList" resultType="Role"> <select id="findAllList" resultType="Role">
SELECT SELECT
<include refid="roleColumns"/> <include refid="roleColumns"/>
FROM sys_role a FROM ct_bbtc_sys_role a
LEFT JOIN sys_office o ON o.id = a.office_id LEFT JOIN ct_bbtc_sys_office o ON o.id = a.office_id
WHERE a.del_flag = #{DEL_FLAG_NORMAL} WHERE a.del_flag = #{DEL_FLAG_NORMAL}
<if test="unChecked != null and unChecked != ''"> <if test="unChecked != null and unChecked != ''">
AND a.un_checked = #{unChecked} AND a.un_checked = #{unChecked}
...@@ -126,7 +126,7 @@ ...@@ -126,7 +126,7 @@
</select> </select>
<insert id="insert"> <insert id="insert">
INSERT INTO sys_role( INSERT INTO ct_bbtc_sys_role(
id, id,
office_id, office_id,
name, name,
...@@ -160,7 +160,7 @@ ...@@ -160,7 +160,7 @@
</insert> </insert>
<update id="update"> <update id="update">
UPDATE sys_role SET UPDATE ct_bbtc_sys_role SET
office_id = #{office.id}, office_id = #{office.id},
name = #{name}, name = #{name},
enname = #{enname}, enname = #{enname},
...@@ -175,11 +175,11 @@ ...@@ -175,11 +175,11 @@
</update> </update>
<delete id="deleteRoleMenu"> <delete id="deleteRoleMenu">
DELETE FROM sys_menu2role WHERE role_id = #{id} DELETE FROM ct_bbtc_sys_menu2role WHERE role_id = #{id}
</delete> </delete>
<insert id="insertRoleMenu"> <insert id="insertRoleMenu">
INSERT INTO sys_menu2role(role_id, menu_id) INSERT INTO ct_bbtc_sys_menu2role(role_id, menu_id)
<foreach collection="menuList" item="menu" separator=" union all "> <foreach collection="menuList" item="menu" separator=" union all ">
SELECT #{id}, #{menu.id} SELECT #{id}, #{menu.id}
<if test="dbName != 'mssql'"> <if test="dbName != 'mssql'">
...@@ -189,11 +189,11 @@ ...@@ -189,11 +189,11 @@
</insert> </insert>
<delete id="deleteRoleOffice"> <delete id="deleteRoleOffice">
DELETE FROM sys_office2role WHERE role_id = #{id} DELETE FROM ct_bbtc_sys_office2role WHERE role_id = #{id}
</delete> </delete>
<insert id="insertRoleOffice"> <insert id="insertRoleOffice">
INSERT INTO sys_office2role(role_id, office_id) INSERT INTO ct_bbtc_sys_office2role(role_id, office_id)
<foreach collection="officeList" item="office" separator=" union all "> <foreach collection="officeList" item="office" separator=" union all ">
SELECT #{id}, #{office.id} SELECT #{id}, #{office.id}
<if test="dbName != 'mssql'"> <if test="dbName != 'mssql'">
...@@ -203,7 +203,7 @@ ...@@ -203,7 +203,7 @@
</insert> </insert>
<update id="delete"> <update id="delete">
UPDATE sys_role SET UPDATE ct_bbtc_sys_role SET
del_flag = #{DEL_FLAG_DELETE} del_flag = #{DEL_FLAG_DELETE}
WHERE id = #{id} WHERE id = #{id}
</update> </update>
......
target/report_sunac/WEB-INF/classes/WEB-INF/classes/mappings/modules/sys/UserDao.xml
...@@ -111,23 +111,23 @@ ...@@ -111,23 +111,23 @@
</sql> </sql>
<sql id="userJoins"> <sql id="userJoins">
LEFT JOIN sys_office c ON c.id = a.company_id LEFT JOIN ct_bbtc_sys_office c ON c.id = a.company_id
LEFT JOIN sys_area ca ON ca.id = c.area_id LEFT JOIN ct_bbtc_sys_area ca ON ca.id = c.area_id
LEFT JOIN sys_office o ON o.id = a.office_id LEFT JOIN ct_bbtc_sys_office o ON o.id = a.office_id
LEFT JOIN sys_area oa ON oa.id = o.area_id LEFT JOIN ct_bbtc_sys_area oa ON oa.id = o.area_id
LEFT JOIN sys_user cu ON cu.id = c.primary_person LEFT JOIN ct_bbtc_sys_user cu ON cu.id = c.primary_person
LEFT JOIN sys_user cu2 ON cu2.id = c.deputy_person LEFT JOIN ct_bbtc_sys_user cu2 ON cu2.id = c.deputy_person
LEFT JOIN sys_user ou ON ou.id = o.primary_person LEFT JOIN ct_bbtc_sys_user ou ON ou.id = o.primary_person
LEFT JOIN sys_user ou2 ON ou2.id = o.deputy_person<!-- LEFT JOIN ct_bbtc_sys_user ou2 ON ou2.id = o.deputy_person<!--
LEFT JOIN sys_user2role ur ON ur.user_id = a.id LEFT JOIN ct_bbtc_sys_user2role ur ON ur.user_id = a.id
LEFT JOIN sys_role r ON r.id = ur.role_id --> LEFT JOIN ct_bbtc_sys_role r ON r.id = ur.role_id -->
</sql> </sql>
<!-- 根据编号获得用户 --> <!-- 根据编号获得用户 -->
<select id="get" resultType="User"> <select id="get" resultType="User">
SELECT SELECT
<include refid="userColumns"/> <include refid="userColumns"/>
FROM sys_user a FROM ct_bbtc_sys_user a
<include refid="userJoins"/> <include refid="userJoins"/>
WHERE a.id = #{id} WHERE a.id = #{id}
</select> </select>
...@@ -137,9 +137,9 @@ ...@@ -137,9 +137,9 @@
SELECT SELECT
<include refid="userColumns"/><!-- , <include refid="userColumns"/><!-- ,
ro.office_id AS "roleList.officeList.id" --> ro.office_id AS "roleList.officeList.id" -->
FROM sys_user a FROM ct_bbtc_sys_user a
<include refid="userJoins"/><!-- <include refid="userJoins"/><!--
LEFT JOIN sys_office2role ro ON ro.role_id = r.id --> LEFT JOIN ct_bbtc_sys_office2role ro ON ro.role_id = r.id -->
WHERE a.login_name = #{loginName} AND a.del_flag = #{DEL_FLAG_NORMAL} WHERE a.login_name = #{loginName} AND a.del_flag = #{DEL_FLAG_NORMAL}
</select> </select>
...@@ -148,13 +148,13 @@ ...@@ -148,13 +148,13 @@
SELECT SELECT
role.id AS roleId, role.id AS roleId,
<include refid="userColumns"/> <include refid="userColumns"/>
FROM sys_user a FROM ct_bbtc_sys_user a
<include refid="userJoins"/> <include refid="userJoins"/>
<if test="role != null and role.id != null and role.id != ''"> <if test="role != null and role.id != null and role.id != ''">
JOIN sys_user2role ur ON ur.user_id = a.id AND ur.role_id = #{role.id} JOIN ct_bbtc_sys_user2role ur ON ur.user_id = a.id AND ur.role_id = #{role.id}
</if> </if>
LEFT JOIN sys_user2role ur ON ur.user_id = a.id LEFT JOIN ct_bbtc_sys_user2role ur ON ur.user_id = a.id
LEFT JOIN sys_role role ON ur.role_id = role.id LEFT JOIN ct_bbtc_sys_role role ON ur.role_id = role.id
WHERE a.del_flag = #{DEL_FLAG_NORMAL} WHERE a.del_flag = #{DEL_FLAG_NORMAL}
<if test="company != null and company.id != null and company.id != ''"> <if test="company != null and company.id != null and company.id != ''">
AND (c.id = #{company.id} OR c.parent_ids LIKE AND (c.id = #{company.id} OR c.parent_ids LIKE
...@@ -200,7 +200,7 @@ ...@@ -200,7 +200,7 @@
<select id="findUserByOfficeId" resultType="User" useCache="true"> <select id="findUserByOfficeId" resultType="User" useCache="true">
SELECT SELECT
a.id, a.name, a.login_name a.id, a.name, a.login_name
FROM sys_user a FROM ct_bbtc_sys_user a
WHERE a.del_flag = #{DEL_FLAG_NORMAL} WHERE a.del_flag = #{DEL_FLAG_NORMAL}
AND a.office_id = #{office.id} AND a.office_id = #{office.id}
ORDER BY a.name ORDER BY a.name
...@@ -210,7 +210,7 @@ ...@@ -210,7 +210,7 @@
<select id="findAllList" resultType="User"> <select id="findAllList" resultType="User">
SELECT SELECT
<include refid="userColumns"/> <include refid="userColumns"/>
FROM sys_user a FROM ct_bbtc_sys_user a
<include refid="userJoins"/> <include refid="userJoins"/>
WHERE a.del_flag = #{DEL_FLAG_NORMAL} WHERE a.del_flag = #{DEL_FLAG_NORMAL}
ORDER BY c.code, o.code, a.name ORDER BY c.code, o.code, a.name
...@@ -220,13 +220,13 @@ ...@@ -220,13 +220,13 @@
<select id="findAllCount" resultType="long"> <select id="findAllCount" resultType="long">
SELECT SELECT
COUNT(1) COUNT(1)
FROM sys_user a FROM ct_bbtc_sys_user a
WHERE a.del_flag = #{DEL_FLAG_NORMAL} WHERE a.del_flag = #{DEL_FLAG_NORMAL}
</select> </select>
<!-- 插入用户 --> <!-- 插入用户 -->
<insert id="insert"> <insert id="insert">
INSERT INTO sys_user( INSERT INTO ct_bbtc_sys_user(
id, id,
company_id, company_id,
office_id, office_id,
...@@ -269,7 +269,7 @@ ...@@ -269,7 +269,7 @@
) )
</insert> </insert>
<insert id="insertOfficeName"> <insert id="insertOfficeName">
INSERT INTO sys_user_profiles( INSERT INTO ct_bbtc_sys_user_profiles(
user_id, user_id,
office_name, office_name,
device_update device_update
...@@ -281,7 +281,7 @@ ...@@ -281,7 +281,7 @@
</insert> </insert>
<!-- 更新用户 --> <!-- 更新用户 -->
<update id="update"> <update id="update">
UPDATE sys_user SET UPDATE ct_bbtc_sys_user SET
company_id = #{company.id}, company_id = #{company.id},
office_id = #{office.id}, office_id = #{office.id},
login_name = #{loginName}, login_name = #{loginName},
...@@ -302,12 +302,12 @@ ...@@ -302,12 +302,12 @@
<!-- 删除用户和角色关联表数据 --> <!-- 删除用户和角色关联表数据 -->
<delete id="deleteUserRole"> <delete id="deleteUserRole">
DELETE FROM sys_user2role WHERE user_id = #{id} DELETE FROM ct_bbtc_sys_user2role WHERE user_id = #{id}
</delete> </delete>
<!-- 插入用户和角色关联表数据 --> <!-- 插入用户和角色关联表数据 -->
<insert id="insertUserRole"> <insert id="insertUserRole">
INSERT INTO sys_user2role(user_id, role_id) INSERT INTO ct_bbtc_sys_user2role(user_id, role_id)
<foreach collection="roleList" item="role" separator=" union all "> <foreach collection="roleList" item="role" separator=" union all ">
SELECT #{id}, #{role.id} SELECT #{id}, #{role.id}
<if test="dbName != 'mssql'"> <if test="dbName != 'mssql'">
...@@ -318,7 +318,7 @@ ...@@ -318,7 +318,7 @@
<!-- 更新用户信息 --> <!-- 更新用户信息 -->
<update id="updateUserInfo"> <update id="updateUserInfo">
UPDATE sys_user SET UPDATE ct_bbtc_sys_user SET
email = #{email}, email = #{email},
phone = #{phone}, phone = #{phone},
mobile = #{mobile}, mobile = #{mobile},
...@@ -331,14 +331,14 @@ ...@@ -331,14 +331,14 @@
<!-- 更新用户密码 --> <!-- 更新用户密码 -->
<update id="updatePasswordById"> <update id="updatePasswordById">
UPDATE sys_user SET UPDATE ct_bbtc_sys_user SET
password = #{password} password = #{password}
WHERE id = #{id} WHERE id = #{id}
</update> </update>
<!-- 更新登录信息，如登录IP、登录时间 --> <!-- 更新登录信息，如登录IP、登录时间 -->
<update id="updateLoginInfo"> <update id="updateLoginInfo">
UPDATE sys_user SET UPDATE ct_bbtc_sys_user SET
login_ip = #{loginIp}, login_ip = #{loginIp},
login_Date = #{loginDate} login_Date = #{loginDate}
WHERE id = #{id} WHERE id = #{id}
...@@ -346,7 +346,7 @@ ...@@ -346,7 +346,7 @@
<!-- 逻辑删除用户 --> <!-- 逻辑删除用户 -->
<update id="delete"> <update id="delete">
UPDATE sys_user SET UPDATE ct_bbtc_sys_user SET
del_flag = #{DEL_FLAG_DELETE} del_flag = #{DEL_FLAG_DELETE}
WHERE id = #{id} WHERE id = #{id}
</update> </update>
......
target/report_sunac/WEB-INF/classes/WEB-INF/classes/mappings/modules/upload/UploadDao.xml
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
orientation orientation
</sql> </sql>
<insert id="addUploadFile" useGeneratedKeys="true" keyProperty="id"> <insert id="addUploadFile" useGeneratedKeys="true" keyProperty="id">
INSERT INTO upload_files( INSERT INTO ct_bbtc_upload_files(
<include refid="fileColumns"/> <include refid="fileColumns"/>
) VALUES( ) VALUES(
#{fileId}, #{fileId},
...@@ -43,7 +43,9 @@ ...@@ -43,7 +43,9 @@
</insert> </insert>
<select id="getFileByPath" resultType="com.ejweb.modules.upload.entity.UploadEntity"> <select id="getFileByPath" resultType="com.ejweb.modules.upload.entity.UploadEntity">
SELECT orientation FROM upload_files SELECT orientation FROM ct_bbtc_upload_files
WHERE #{path} LIKE CONCAT('%', path, '%') WHERE #{path} LIKE
<if test="dbName == 'oracle'"> '%'|| path|| '%'</if>
<if test="dbName == 'mysql'"> CONCAT('%', path, '%')</if>
</select> </select>
</mapper> </mapper>
\ No newline at end of file
target/report_sunac/WEB-INF/classes/WEB-INF/classes/spring-mvc.xml
...@@ -139,8 +139,8 @@ ...@@ -139,8 +139,8 @@
<!-- 支持Shiro对Controller的方法级AOP安全控制 end --> <!-- 支持Shiro对Controller的方法级AOP安全控制 end -->
<!-- 上传文件拦截，设置最大上传文件大小 10M=10*1024*1024(B)=10485760 bytes --> <!-- 上传文件拦截，设置最大上传文件大小 10M=10*1024*1024(B)=10485760 bytes -->
<bean id="multipartResolver" class="com.ejweb.core.filter.BaiduCommonsMultipartResolver"> <!--<bean id="multipartResolver" class="com.ejweb.core.filter.BaiduCommonsMultipartResolver">
<property name="maxUploadSize" value="${web.maxUploadSize}" /> <property name="maxUploadSize" value="${web.maxUploadSize}" />
</bean> </bean>-->
</beans> </beans>
\ No newline at end of file
target/report_sunac/WEB-INF/classes/WEB-INF/tags/sys/validateCode.tag
...@@ -5,5 +5,5 @@ ...@@ -5,5 +5,5 @@
<%@ attribute name="imageCssStyle" type="java.lang.String" required="false" description="验证码图片样式"%> <%@ attribute name="imageCssStyle" type="java.lang.String" required="false" description="验证码图片样式"%>
<%@ attribute name="buttonCssStyle" type="java.lang.String" required="false" description="看不清按钮样式"%> <%@ attribute name="buttonCssStyle" type="java.lang.String" required="false" description="看不清按钮样式"%>
<input type="text" id="${name}" name="${name}" maxlength="5" class="txt required" style="font-weight:bold;width:45px;${inputCssStyle}"/> <input type="text" id="${name}" name="${name}" maxlength="5" class="txt required" style="font-weight:bold;width:45px;${inputCssStyle}"/>
<img src="${pageContext.request.contextPath}/servlet/validateCodeServlet" onclick="$('.${name}Refresh').click();" class="mid ${name}" style="${imageCssStyle}"/> <img src="${pageContext.request.contextPath}/servlet/validateCodeServlet1" onclick="$('.${name}Refresh').click();" class="mid ${name}" style="${imageCssStyle}"/>
<a href="javascript:" onclick="$('.${name}').attr('src','${pageContext.request.contextPath}/servlet/validateCodeServlet?'+new Date().getTime());" class="mid ${name}Refresh" style="${buttonCssStyle}">看不清</a> <a href="javascript:" onclick="$('.${name}').attr('src','${pageContext.request.contextPath}/servlet/validateCodeServlet1?'+new Date().getTime());" class="mid ${name}Refresh" style="${buttonCssStyle}">看不清</a>
\ No newline at end of file \ No newline at end of file
target/report_sunac/WEB-INF/classes/WEB-INF/views/modules/sys/menuTree.jsp
...@@ -27,6 +27,14 @@ ...@@ -27,6 +27,14 @@
</script> </script>
</head> </head>
<body> --%> <body> --%>
<script type="text/javascript">
function showMessage() {
var result = "${result}";
if (result == "") {
$("#messageDiv").hide();
}
}
</script>
<div class="accordion" id="menu-${param.parentId}"> <div class="accordion" id="menu-${param.parentId}">
<c:set var="menuList" value="${fns:getMenuList()}"/><c:set var="firstMenu" value="true"/> <c:set var="menuList" value="${fns:getMenuList()}"/><c:set var="firstMenu" value="true"/>
<c:forEach items="${menuList}" var="menu" varStatus="idxStatus"> <c:forEach items="${menuList}" var="menu" varStatus="idxStatus">
...@@ -35,8 +43,14 @@ ...@@ -35,8 +43,14 @@
<c:if test="${(fns:getUser().admin && menu.id ne '81687207761300463255') || (!fns:getUser().admin)}"> <c:if test="${(fns:getUser().admin && menu.id ne '81687207761300463255') || (!fns:getUser().admin)}">
<!-- --> <!-- -->
<div class="accordion-group"> <div class="accordion-group">
<div class="accordion-heading"> <div class="accordion-heading" style="position:relative;"><div>
<a class="accordion-toggle" data-toggle="collapse" data-parent="#menu-${param.parentId}" data-href="#collapse-${menu.id}" href="#collapse-${menu.id}" title="${menu.remarks}"><i class="icon-chevron-${not empty firstMenu && firstMenu ? 'down' : 'right'}"></i>&nbsp;${menu.name}</a> <a class="accordion-toggle" data-toggle="collapse" data-parent="#menu-${param.parentId}" data-href="#collapse-${menu.id}" href="#collapse-${menu.id}" title="${menu.remarks}">
<i class="icon-chevron-${not empty firstMenu && firstMenu ? 'down' : 'right'}"></i>&nbsp;${menu.name}</a></div>
<c:if test="${menu.name eq '消息中心'}">
<div id="messageDiv" style="position:absolute;right:20px;top:10px;width:15px; height:15px; background-color:#F00; border-radius:25px;">
<span id="promptMessage" style="height:15px; line-height:15px; display:block; color:#FFF; text-align:center">${result}</span>
</div>
</c:if>
</div> </div>
<div id="collapse-${menu.id}" class="accordion-body collapse ${not empty firstMenu && firstMenu ? 'in' : ''}"> <div id="collapse-${menu.id}" class="accordion-body collapse ${not empty firstMenu && firstMenu ? 'in' : ''}">
<div class="accordion-inner"> <div class="accordion-inner">
...@@ -61,6 +75,8 @@ ...@@ -61,6 +75,8 @@
</div> </div>
</c:if> </c:if>
</c:if> </c:if>
</c:forEach></div><%-- </c:forEach></div>
<img hidden src="about:blank" onerror="showMessage();">
<%--
</body> </body>
</html> --%> </html> --%>
\ No newline at end of file
target/report_sunac/WEB-INF/classes/WEB-INF/views/modules/sys/sysIndex.jsp
...@@ -125,6 +125,23 @@ ...@@ -125,6 +125,23 @@
$(this).click(); $(this).click();
} }
}); });
$.ajax({
url: "${ctx}/notice/prompt",
dataType: "text",
traditional: true,//这里设置为true
cache: false,
success: function(result) { //登录成功后返回的数据
if (result != "") {
$("#prompt").text(result);
$("#message").show();
}else {
$("#message").hide();
}
},
error:function(){
alert("系统错误！");
}
});
}); });
// <c:if test="${tabmode eq '1'}"> 添加一个页签 // <c:if test="${tabmode eq '1'}"> 添加一个页签
function addTab($this, refresh){ function addTab($this, refresh){
...@@ -141,6 +158,15 @@ ...@@ -141,6 +158,15 @@
}).loadData(refresh); }).loadData(refresh);
return false; return false;
}// </c:if> }// </c:if>
function refreshPromt(result) {
if (result != "") {
$("#prompt").text(result);
$("#promptMessage").text(result);
}else {
$("#message").hide();
$("#messageDiv").hide();
}
}
</script> </script>
</head> </head>
<body> <body>
...@@ -164,7 +190,7 @@ ...@@ -164,7 +190,7 @@
<li><a href="${ctx}/sys/user/modifyPwd" target="mainFrame"><i class="icon-lock"></i>&nbsp; 修改密码</a></li> <li><a href="${ctx}/sys/user/modifyPwd" target="mainFrame"><i class="icon-lock"></i>&nbsp; 修改密码</a></li>
</ul>--%> </ul>--%>
</li> </li>
<c:if test="${fns:getUser().id eq '1'}"><li><a href="${ctx}/logout" title="退出登录">退出</a></li></c:if> <%--<c:if test="${fns:getUser().id eq '1'}"><li><a href="${ctx}/logout" title="退出登录">退出</a></li></c:if>--%>
<li>&nbsp;</li> <li>&nbsp;</li>
</ul> </ul>
<%-- <c:if test="${cookie.theme.value eq 'cerulean'}"> <%-- <c:if test="${cookie.theme.value eq 'cerulean'}">
...@@ -183,7 +209,12 @@ ...@@ -183,7 +209,12 @@
<c:if test="${menu.parent.id eq '1'&&menu.isShow eq '1'}"> <c:if test="${menu.parent.id eq '1'&&menu.isShow eq '1'}">
<li class="menu ${not empty firstMenu && firstMenu ? ' active' : ''}"> <li class="menu ${not empty firstMenu && firstMenu ? ' active' : ''}">
<c:if test="${empty menu.href}"> <c:if test="${empty menu.href}">
<a class="menu" href="javascript:" data-href="${ctx}/sys/menu/tree?parentId=${menu.id}" data-id="${menu.id}"><span>${menu.name}</span></a> <a class="menu" href="javascript:" data-href="${ctx}/sys/menu/tree?parentId=${menu.id}" data-id="${menu.id}"><div style="position:relative;"><div><span>${menu.name}</span></div>
<c:if test="${menu.name eq '工作台'}">
<div id="message" style="position:absolute;right:-10px;top:-10px;width:15px; height:15px; background-color:#F00; border-radius:25px;display:none;">
<span id="prompt" style="height:15px; line-height:15px; display:block; color:#FFF; text-align:center"></span>
</div>
</c:if></div></a>
</c:if> </c:if>
<c:if test="${not empty menu.href}"> <c:if test="${not empty menu.href}">
<a class="menu" href="${fn:indexOf(menu.href, '://') eq -1 ? ctx : ''}${menu.href}" data-id="${menu.id}" target="mainFrame"><span>${menu.name}</span></a> <a class="menu" href="${fn:indexOf(menu.href, '://') eq -1 ? ctx : ''}${menu.href}" data-id="${menu.id}" target="mainFrame"><span>${menu.name}</span></a>
......
target/report_sunac/WEB-INF/classes/WEB-INF/views/modules/sys/sysIndex2.jsp
...@@ -148,7 +148,7 @@ ...@@ -148,7 +148,7 @@
<li><a href="${ctx}/sys/user/modifyPwd" target="mainFrame"><i class="icon-lock"></i>&nbsp; 修改密码</a></li> <li><a href="${ctx}/sys/user/modifyPwd" target="mainFrame"><i class="icon-lock"></i>&nbsp; 修改密码</a></li>
</ul>--%> </ul>--%>
</li> </li>
<li><a href="${ctx}/logout" title="退出登录">退出</a></li> <li><%--<a href="${ctx}/logout" title="退出登录">退出</a>--%></li>
<li>&nbsp;</li> <li>&nbsp;</li>
</ul> </ul>
<%--<c:if test="${cookie.theme.value eq 'cerulean'}"> --%> <%--<c:if test="${cookie.theme.value eq 'cerulean'}"> --%>
......
target/report_sunac/WEB-INF/classes/WEB-INF/views/modules/sys/sysLogin.jsp
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
$(document).ready(function() { $(document).ready(function() {
$("#loginForm").validate({ $("#loginForm").validate({
rules: { rules: {
validateCode: {remote: "${pageContext.request.contextPath}/servlet/validateCodeServlet"} validateCode: {remote: "${pageContext.request.contextPath}/servlet/validateCodeServlet1"}
}, },
messages: { messages: {
username: {required: "请填写用户名."},password: {required: "请填写密码."}, username: {required: "请填写用户名."},password: {required: "请填写密码."},
......
target/report_sunac/WEB-INF/classes/WEB-INF/views/modules/sys/userForm.jsp
...@@ -40,13 +40,13 @@ ...@@ -40,13 +40,13 @@
<form:form id="inputForm" modelAttribute="user" action="${ctx}/sys/user/save" method="post" class="form-horizontal"> <form:form id="inputForm" modelAttribute="user" action="${ctx}/sys/user/save" method="post" class="form-horizontal">
<form:hidden path="id"/> <form:hidden path="id"/>
<sys:message content="${message}"/> <sys:message content="${message}"/>
<div class="control-group"> <%--<div class="control-group">
<label class="control-label">头像:</label> <label class="control-label">头像:</label>
<div class="controls"> <div class="controls">
<form:hidden id="nameImage" path="photo" htmlEscape="false" maxlength="255" class="input-xlarge"/> <form:hidden id="nameImage" path="photo" htmlEscape="false" maxlength="255" class="input-xlarge"/>
<sys:ckfinder input="nameImage" type="images" uploadPath="/photo" selectMultiple="false" maxWidth="100" maxHeight="100"/> <sys:ckfinder input="nameImage" type="images" uploadPath="/photo" selectMultiple="false" maxWidth="100" maxHeight="100"/>
</div> </div>
</div> </div>--%>
<%--<div class="control-group"> <%--<div class="control-group">
<label class="control-label">归属公司:</label> <label class="control-label">归属公司:</label>
<div class="controls"> <div class="controls">
...@@ -61,13 +61,13 @@ ...@@ -61,13 +61,13 @@
title="部门" url="/sys/office/treeData?type=2" notAllowSelectParent="true"/> title="部门" url="/sys/office/treeData?type=2" notAllowSelectParent="true"/>
</div> </div>
</div>--%> </div>--%>
<div class="control-group"> <%--<div class="control-group">
<label class="control-label">工号:</label> <label class="control-label">工号:</label>
<div class="controls"> <div class="controls">
<form:input path="no" htmlEscape="false" maxlength="50" class="required"/> <form:input path="no" htmlEscape="false" maxlength="50" class="required"/>
<span class="help-inline"><font color="red">*</font> </span> <span class="help-inline"><font color="red">*</font> </span>
</div> </div>
</div> </div>--%>
<div class="control-group"> <div class="control-group">
<label class="control-label">姓名:</label> <label class="control-label">姓名:</label>
<div class="controls"> <div class="controls">
...@@ -83,7 +83,7 @@ ...@@ -83,7 +83,7 @@
<span class="help-inline"><font color="red">*</font> </span> <span class="help-inline"><font color="red">*</font> </span>
</div> </div>
</div> </div>
<div class="control-group"> <%--<div class="control-group">
<label class="control-label">密码:</label> <label class="control-label">密码:</label>
<div class="controls"> <div class="controls">
<input id="newPassword" name="newPassword" type="password" value="" maxlength="50" minlength="3" class="${empty user.id?'required':''}"/> <input id="newPassword" name="newPassword" type="password" value="" maxlength="50" minlength="3" class="${empty user.id?'required':''}"/>
...@@ -124,7 +124,7 @@ ...@@ -124,7 +124,7 @@
</form:select> </form:select>
<span class="help-inline"><font color="red">*</font> “是”代表此账号允许登录，“否”则表示此账号不允许登录</span> <span class="help-inline"><font color="red">*</font> “是”代表此账号允许登录，“否”则表示此账号不允许登录</span>
</div> </div>
</div> </div>--%>
<%-- <div class="control-group"> <%-- <div class="control-group">
<label class="control-label">用户类型:</label> <label class="control-label">用户类型:</label>
<div class="controls"> <div class="controls">
...@@ -141,7 +141,7 @@ ...@@ -141,7 +141,7 @@
<span class="help-inline"><font color="red">*</font> </span> <span class="help-inline"><font color="red">*</font> </span>
</div> </div>
</div> </div>
<div class="control-group"> <%--<div class="control-group">
<label class="control-label">备注:</label> <label class="control-label">备注:</label>
<div class="controls"> <div class="controls">
<form:textarea path="remarks" htmlEscape="false" rows="3" maxlength="200" class="input-xlarge"/> <form:textarea path="remarks" htmlEscape="false" rows="3" maxlength="200" class="input-xlarge"/>
...@@ -160,7 +160,7 @@ ...@@ -160,7 +160,7 @@
<label class="lbl">IP: ${user.loginIp}&nbsp;&nbsp;&nbsp;&nbsp;时间：<fmt:formatDate value="${user.loginDate}" type="both" dateStyle="full"/></label> <label class="lbl">IP: ${user.loginIp}&nbsp;&nbsp;&nbsp;&nbsp;时间：<fmt:formatDate value="${user.loginDate}" type="both" dateStyle="full"/></label>
</div> </div>
</div> </div>
</c:if> </c:if>--%>
<div class="form-actions"> <div class="form-actions">
<shiro:hasPermission name="sys:user:edit"><input id="btnSubmit" class="btn btn-primary" type="submit" value="保 存"/>&nbsp;</shiro:hasPermission> <shiro:hasPermission name="sys:user:edit"><input id="btnSubmit" class="btn btn-primary" type="submit" value="保 存"/>&nbsp;</shiro:hasPermission>
<input id="btnCancel" class="btn" type="button" value="返 回" onclick="history.go(-1)"/> <input id="btnCancel" class="btn" type="button" value="返 回" onclick="history.go(-1)"/>
......
target/report_sunac/WEB-INF/classes/WEB-INF/web.xml
...@@ -157,6 +157,14 @@ ...@@ -157,6 +157,14 @@
<servlet-name>ValidateCodeServlet</servlet-name> <servlet-name>ValidateCodeServlet</servlet-name>
<url-pattern>/api/front/report/validateCodeServlet</url-pattern> <url-pattern>/api/front/report/validateCodeServlet</url-pattern>
</servlet-mapping> </servlet-mapping>
<servlet>
<servlet-name>ValidateCodeServlet1</servlet-name>
<servlet-class>com.ejweb.core.servlet.ValidateCodeServlet</servlet-class>
</servlet>
<servlet-mapping>
<servlet-name>ValidateCodeServlet1</servlet-name>
<url-pattern>/servlet/validateCodeServlet1</url-pattern>
</servlet-mapping>
<!--验证码--> <!--验证码-->
......
target/report_sunac/WEB-INF/classes/ejweb.properties
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
#============================# #============================#
#\u4ea7\u54c1\u4fe1\u606f\u8bbe\u7f6e #\u4ea7\u54c1\u4fe1\u606f\u8bbe\u7f6e
productName=\u76d1\u5bdf\u4e3e\u62a5\u7ba1\u7406\u7cfb\u7edf productName=\u76d1\u5bdf\u5ba1\u8ba1\u7ba1\u7406\u7cfb\u7edf
copyrightYear=2017 copyrightYear=2017
version=V1.2.6 version=V1.2.6
...@@ -73,9 +73,10 @@ userfiles.prefix=static ...@@ -73,9 +73,10 @@ userfiles.prefix=static
#projectPath=D\:\\workspace\\jeesite #projectPath=D\:\\workspace\\jeesite
# The Upload File DIR, Must End With File Separator # The Upload File DIR, Must End With File Separator
## file.upload.dir=/mnt/yunbbc/ file.upload.dir=/home/static/report/
#file.upload.dir=/mnt/sunac/
## file.upload.dir=D:\\WorkSapce\\JEESpace\\ejweb-api-1.0\\files\\ ## file.upload.dir=D:\\WorkSapce\\JEESpace\\ejweb-api-1.0\\files\\
file.upload.dir=/D:/uploads/ #file.upload.dir=/D:/uploads/
# Max Upload File Size: (default 30M=30*1024*1024(B)=31457280 bytes) # Max Upload File Size: (default 30M=30*1024*1024(B)=31457280 bytes)
file.max.upload.size=31457280 file.max.upload.size=31457280
# The File Path Date Format(default yyyyMM) # The File Path Date Format(default yyyyMM)
...@@ -94,7 +95,12 @@ file.image.thumb.is.allow=true ...@@ -94,7 +95,12 @@ file.image.thumb.is.allow=true
file.image.thumb.width=640 file.image.thumb.width=640
file.image.thumb.height=640 file.image.thumb.height=640
# The Prefix Url # The Prefix Url
file.prefix.url=http://127.0.0.1:8080/static/ #file.prefix.url=http://123.56.146.81:8808/
#ڴ
#file.prefix.url=http://192.168.7.210:8081/
#ڴʽ
#file.prefix.url=http://192.168.2.62:8082/
file.prefix.url=http://221.239.118.251:8899/static/report/
# The Prefix separator # The Prefix separator
file.upload.path.separator = / file.upload.path.separator = /
......
target/report_sunac/WEB-INF/classes/jdbc.properties
#MySQL Database Config(The All Config Is Must) #MySQL Database Config(The All Config Is Must)
db.table.prefix=sunac_ db.table.prefix=sunac_
jdbc.type=mysql
jdbc.driver.class=com.mysql.jdbc.Driver #jdbc.type=mysql
jdbc.url=jdbc:mysql://123.56.146.7:3306/sunac_report?useUnicode=true&characterEncoding=utf-8 #jdbc.driver.class=com.mysql.jdbc.Driver
jdbc.username=reportuser #jdbc.url=jdbc:mysql://123.56.146.7:3306/sunac_report?useUnicode=true&characterEncoding=utf-8
jdbc.password=$R@20$7 #jdbc.username=reportuser
#jdbc.password=$R@20$7
#融创测试数据库
jdbc.type=oracle
jdbc.driver.class=oracle.jdbc.driver.OracleDriver
jdbc.url=jdbc:oracle:thin:@192.168.2.53:1521:eas
jdbc.username=eas7531
jdbc.password=sunac
#正式数据库
#jdbc.type=oracle
#jdbc.driver.class=oracle.jdbc.driver.OracleDriver
#jdbc.url=jdbc:oracle:thin:@192.168.2.24:1521:eas
#jdbc.username= easdba
#jdbc.password= Sunac_1918
#初始化连接 #初始化连接
jdbc.initialSize=0 jdbc.initialSize=0
......
target/report_sunac/WEB-INF/classes/mappings/modules/sys/AreaDao.xml
...@@ -20,13 +20,13 @@ ...@@ -20,13 +20,13 @@
</sql> </sql>
<sql id="areaJoins"> <sql id="areaJoins">
LEFT JOIN sys_office p ON p.id = a.parent_id LEFT JOIN ct_bbtc_sys_office p ON p.id = a.parent_id
</sql> </sql>
<select id="get" resultType="Area"> <select id="get" resultType="Area">
SELECT SELECT
<include refid="areaColumns"/> <include refid="areaColumns"/>
FROM sys_area a FROM ct_bbtc_sys_area a
<include refid="areaJoins"/> <include refid="areaJoins"/>
WHERE a.id = #{id} WHERE a.id = #{id}
</select> </select>
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
<select id="findList" resultType="Area"> <select id="findList" resultType="Area">
SELECT SELECT
<include refid="areaColumns"/> <include refid="areaColumns"/>
FROM sys_area a FROM ct_bbtc_sys_area a
<include refid="areaJoins"/> <include refid="areaJoins"/>
WHERE a.del_flag = #{DEL_FLAG_NORMAL} WHERE a.del_flag = #{DEL_FLAG_NORMAL}
<!-- 数据范围过滤 --> <!-- 数据范围过滤 -->
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
<select id="findAllList" resultType="Area"> <select id="findAllList" resultType="Area">
SELECT SELECT
<include refid="areaColumns"/> <include refid="areaColumns"/>
FROM sys_area a FROM ct_bbtc_sys_area a
<include refid="areaJoins"/> <include refid="areaJoins"/>
WHERE a.del_flag = #{DEL_FLAG_NORMAL} WHERE a.del_flag = #{DEL_FLAG_NORMAL}
ORDER BY a.code ORDER BY a.code
...@@ -57,13 +57,13 @@ ...@@ -57,13 +57,13 @@
a.id, a.id,
a.parent_id AS "parent.id", a.parent_id AS "parent.id",
a.parent_ids a.parent_ids
FROM sys_area a FROM ct_bbtc_sys_area a
WHERE a.del_flag = #{DEL_FLAG_NORMAL} AND a.parent_ids LIKE #{parentIds} WHERE a.del_flag = #{DEL_FLAG_NORMAL} AND a.parent_ids LIKE #{parentIds}
ORDER BY a.code ORDER BY a.code
</select> </select>
<insert id="insert"> <insert id="insert">
INSERT INTO sys_area( INSERT INTO ct_bbtc_sys_area(
id, id,
parent_id, parent_id,
parent_ids, parent_ids,
...@@ -95,7 +95,7 @@ ...@@ -95,7 +95,7 @@
</insert> </insert>
<update id="update"> <update id="update">
UPDATE sys_area SET UPDATE ct_bbtc_sys_area SET
parent_id = #{parent.id}, parent_id = #{parent.id},
parent_ids = #{parentIds}, parent_ids = #{parentIds},
code = #{code}, code = #{code},
...@@ -109,14 +109,14 @@ ...@@ -109,14 +109,14 @@
</update> </update>
<update id="updateParentIds"> <update id="updateParentIds">
UPDATE sys_area SET UPDATE ct_bbtc_sys_area SET
parent_id = #{parent.id}, parent_id = #{parent.id},
parent_ids = #{parentIds} parent_ids = #{parentIds}
WHERE id = #{id} WHERE id = #{id}
</update> </update>
<update id="delete"> <update id="delete">
UPDATE sys_area SET UPDATE ct_bbtc_sys_area SET
del_flag = #{DEL_FLAG_DELETE} del_flag = #{DEL_FLAG_DELETE}
WHERE id = #{id} OR parent_ids LIKE WHERE id = #{id} OR parent_ids LIKE
<if test="dbName == 'oracle'">'%,'||#{id}||',%'</if> <if test="dbName == 'oracle'">'%,'||#{id}||',%'</if>
......
target/report_sunac/WEB-INF/classes/mappings/modules/sys/DictDao.xml
...@@ -5,14 +5,14 @@ ...@@ -5,14 +5,14 @@
<select id="get" resultType="Dict"> <select id="get" resultType="Dict">
SELECT SELECT
* *
FROM sys_dict FROM ct_bbtc_sys_dict
WHERE id = #{id} WHERE id = #{id}
</select> </select>
<select id="findList" resultType="Dict"> <select id="findList" resultType="Dict">
SELECT SELECT
* *
FROM sys_dict FROM ct_bbtc_sys_dict
WHERE del_flag = #{DEL_FLAG_NORMAL} WHERE del_flag = #{DEL_FLAG_NORMAL}
<if test="type != null and type != ''"> <if test="type != null and type != ''">
AND type = #{type} AND type = #{type}
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
<select id="findAllList" resultType="Dict"> <select id="findAllList" resultType="Dict">
SELECT SELECT
* *
FROM sys_dict FROM ct_bbtc_sys_dict
WHERE del_flag = #{DEL_FLAG_NORMAL} WHERE del_flag = #{DEL_FLAG_NORMAL}
ORDER BY type, sort, update_date DESC ORDER BY type, sort, update_date DESC
</select> </select>
...@@ -37,14 +37,14 @@ ...@@ -37,14 +37,14 @@
<select id="findTypeList" resultType="string"> <select id="findTypeList" resultType="string">
SELECT SELECT
type type
FROM sys_dict FROM ct_bbtc_sys_dict
WHERE del_flag = #{DEL_FLAG_NORMAL} WHERE del_flag = #{DEL_FLAG_NORMAL}
GROUP BY type GROUP BY type
ORDER BY type ORDER BY type
</select> </select>
<insert id="insert"> <insert id="insert">
INSERT INTO sys_dict( INSERT INTO ct_bbtc_sys_dict(
id, id,
value, value,
label, label,
...@@ -74,7 +74,7 @@ ...@@ -74,7 +74,7 @@
</insert> </insert>
<update id="update"> <update id="update">
UPDATE sys_dict SET UPDATE ct_bbtc_sys_dict SET
value = #{value}, value = #{value},
label = #{label}, label = #{label},
type = #{type}, type = #{type},
...@@ -87,7 +87,7 @@ ...@@ -87,7 +87,7 @@
</update> </update>
<update id="delete"> <update id="delete">
UPDATE sys_dict SET UPDATE ct_bbtc_sys_dict SET
del_flag = #{DEL_FLAG_DELETE} del_flag = #{DEL_FLAG_DELETE}
WHERE id = #{id} WHERE id = #{id}
</update> </update>
......
target/report_sunac/WEB-INF/classes/mappings/modules/sys/LogDao.xml
...@@ -9,10 +9,10 @@ ...@@ -9,10 +9,10 @@
u.name AS "createBy.name", u.name AS "createBy.name",
c.name AS "createBy.company.name", c.name AS "createBy.company.name",
o.name AS "createBy.office.name" o.name AS "createBy.office.name"
FROM sys_log a FROM ct_bbtc_sys_log a
LEFT JOIN sys_user u ON u.id = a.create_by LEFT JOIN ct_bbtc_sys_user u ON u.id = a.create_by
LEFT JOIN sys_office c ON c.id = u.company_id LEFT JOIN ct_bbtc_sys_office c ON c.id = u.company_id
LEFT JOIN sys_office o ON o.id = u.office_id LEFT JOIN ct_bbtc_sys_office o ON o.id = u.office_id
WHERE a.create_date BETWEEN #{beginDate} AND #{endDate} WHERE a.create_date BETWEEN #{beginDate} AND #{endDate}
<if test="title != null and title != ''"> <if test="title != null and title != ''">
AND a.title LIKE AND a.title LIKE
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
</select> </select>
<insert id="insert"> <insert id="insert">
INSERT INTO sys_log( INSERT INTO ct_bbtc_sys_log(
id, id,
type, type,
title, title,
......
target/report_sunac/WEB-INF/classes/mappings/modules/sys/MenuDao.xml
...@@ -23,14 +23,14 @@ ...@@ -23,14 +23,14 @@
</sql> </sql>
<sql id="menuJoins"> <sql id="menuJoins">
LEFT JOIN sys_menu p LEFT JOIN ct_bbtc_sys_menu p
ON p.id = a.parent_id ON p.id = a.parent_id
</sql> </sql>
<select id="get" resultType="Menu"> <select id="get" resultType="Menu">
SELECT SELECT
<include refid="menuColumns"/> <include refid="menuColumns"/>
FROM sys_menu a FROM ct_bbtc_sys_menu a
<include refid="menuJoins"/> <include refid="menuJoins"/>
WHERE a.id = #{id} WHERE a.id = #{id}
</select> </select>
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
<select id="findAllList" resultType="Menu"> <select id="findAllList" resultType="Menu">
SELECT SELECT
<include refid="menuColumns"/> <include refid="menuColumns"/>
FROM sys_menu a FROM ct_bbtc_sys_menu a
<include refid="menuJoins"/> <include refid="menuJoins"/>
WHERE a.del_flag = #{DEL_FLAG_NORMAL} WHERE a.del_flag = #{DEL_FLAG_NORMAL}
ORDER BY a.sort ORDER BY a.sort
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
a.id, a.id,
a.parent_id AS "parent.id", a.parent_id AS "parent.id",
a.parent_ids a.parent_ids
FROM sys_menu a FROM ct_bbtc_sys_menu a
WHERE a.del_flag = #{DEL_FLAG_NORMAL} AND a.parent_ids LIKE #{parentIds} WHERE a.del_flag = #{DEL_FLAG_NORMAL} AND a.parent_ids LIKE #{parentIds}
ORDER BY a.sort ORDER BY a.sort
</select> </select>
...@@ -57,18 +57,18 @@ ...@@ -57,18 +57,18 @@
<select id="findByUserId" resultType="Menu"> <select id="findByUserId" resultType="Menu">
SELECT DISTINCT SELECT DISTINCT
<include refid="menuColumns"/> <include refid="menuColumns"/>
FROM sys_menu a FROM ct_bbtc_sys_menu a
LEFT JOIN sys_menu p ON p.id = a.parent_id LEFT JOIN ct_bbtc_sys_menu p ON p.id = a.parent_id
JOIN sys_menu2role rm ON rm.menu_id = a.id JOIN ct_bbtc_sys_menu2role rm ON rm.menu_id = a.id
JOIN sys_role r ON r.id = rm.role_id AND r.useable='1' JOIN ct_bbtc_sys_role r ON r.id = rm.role_id AND r.useable='1'
JOIN sys_user2role ur ON ur.role_id = r.id JOIN ct_bbtc_sys_user2role ur ON ur.role_id = r.id
JOIN sys_user u ON u.id = ur.user_id AND u.id = #{userId} JOIN ct_bbtc_sys_user u ON u.id = ur.user_id AND u.id = #{userId}
WHERE a.del_flag = #{DEL_FLAG_NORMAL} AND r.del_flag = #{DEL_FLAG_NORMAL} AND u.del_flag = #{DEL_FLAG_NORMAL} WHERE a.del_flag = #{DEL_FLAG_NORMAL} AND r.del_flag = #{DEL_FLAG_NORMAL} AND u.del_flag = #{DEL_FLAG_NORMAL}
ORDER BY a.sort ORDER BY a.sort
</select> </select>
<insert id="insert"> <insert id="insert">
INSERT INTO sys_menu( INSERT INTO ct_bbtc_sys_menu(
id, id,
parent_id, parent_id,
parent_ids, parent_ids,
...@@ -106,7 +106,7 @@ ...@@ -106,7 +106,7 @@
</insert> </insert>
<update id="update"> <update id="update">
UPDATE sys_menu SET UPDATE ct_bbtc_sys_menu SET
parent_id = #{parent.id}, parent_id = #{parent.id},
parent_ids = #{parentIds}, parent_ids = #{parentIds},
name = #{name}, name = #{name},
...@@ -123,20 +123,20 @@ ...@@ -123,20 +123,20 @@
</update> </update>
<update id="updateParentIds"> <update id="updateParentIds">
UPDATE sys_menu SET UPDATE ct_bbtc_sys_menu SET
parent_id = #{parent.id}, parent_id = #{parent.id},
parent_ids = #{parentIds} parent_ids = #{parentIds}
WHERE id = #{id} WHERE id = #{id}
</update> </update>
<update id="updateSort"> <update id="updateSort">
UPDATE sys_menu SET UPDATE ct_bbtc_sys_menu SET
sort = #{sort} sort = #{sort}
WHERE id = #{id} WHERE id = #{id}
</update> </update>
<update id="delete"> <update id="delete">
UPDATE sys_menu SET UPDATE ct_bbtc_sys_menu SET
del_flag = #{DEL_FLAG_DELETE} del_flag = #{DEL_FLAG_DELETE}
WHERE id = #{id} OR parent_ids LIKE WHERE id = #{id} OR parent_ids LIKE
<if test="dbName == 'oracle'">'%,'||#{id}||',%'</if> <if test="dbName == 'oracle'">'%,'||#{id}||',%'</if>
......
target/report_sunac/WEB-INF/classes/mappings/modules/sys/OfficeDao.xml
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
a.primary_person AS "primaryPerson.id", a.primary_person AS "primaryPerson.id",
a.deputy_person AS "deputyPerson.id", a.deputy_person AS "deputyPerson.id",
p.name AS "parent.name", p.name AS "parent.name",
p.`code` AS "parent.code", p.code AS "parent.code",
ar.name AS "area.name", ar.name AS "area.name",
ar.parent_ids AS "area.parentIds", ar.parent_ids AS "area.parentIds",
pp.name AS "primaryPerson.name", pp.name AS "primaryPerson.name",
...@@ -37,16 +37,16 @@ ...@@ -37,16 +37,16 @@
</sql> </sql>
<sql id="officeJoins"> <sql id="officeJoins">
LEFT JOIN sys_office p ON p.id = a.parent_id LEFT JOIN ct_bbtc_sys_office p ON p.id = a.parent_id
LEFT JOIN sys_area ar ON ar.id = a.area_id LEFT JOIN ct_bbtc_sys_area ar ON ar.id = a.area_id
LEFT JOIN sys_user pp ON pp.id = a.primary_person LEFT JOIN ct_bbtc_sys_user pp ON pp.id = a.primary_person
LEFT JOIN sys_user dp ON dp.id = a.deputy_person LEFT JOIN ct_bbtc_sys_user dp ON dp.id = a.deputy_person
</sql> </sql>
<select id="get" resultType="Office"> <select id="get" resultType="Office">
SELECT SELECT
<include refid="officeColumns"/> <include refid="officeColumns"/>
FROM sys_office a FROM ct_bbtc_sys_office a
<include refid="officeJoins"/> <include refid="officeJoins"/>
WHERE a.id = #{id} WHERE a.id = #{id}
</select> </select>
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
<select id="findList" resultType="Office"> <select id="findList" resultType="Office">
SELECT SELECT
<include refid="officeColumns"/> <include refid="officeColumns"/>
FROM sys_office a FROM ct_bbtc_sys_office a
<include refid="officeJoins"/> <include refid="officeJoins"/>
WHERE a.del_flag = #{DEL_FLAG_NORMAL} WHERE a.del_flag = #{DEL_FLAG_NORMAL}
<!-- 数据范围过滤 --> <!-- 数据范围过滤 -->
...@@ -66,7 +66,7 @@ ...@@ -66,7 +66,7 @@
<select id="findAllList" resultType="Office"> <select id="findAllList" resultType="Office">
SELECT SELECT
<include refid="officeColumns"/> <include refid="officeColumns"/>
FROM sys_office a FROM ct_bbtc_sys_office a
<include refid="officeJoins"/> <include refid="officeJoins"/>
WHERE a.del_flag = #{DEL_FLAG_NORMAL} WHERE a.del_flag = #{DEL_FLAG_NORMAL}
ORDER BY a.code ORDER BY a.code
...@@ -75,7 +75,7 @@ ...@@ -75,7 +75,7 @@
<select id="findByParentIdsLike" resultType="Office"> <select id="findByParentIdsLike" resultType="Office">
SELECT SELECT
<include refid="officeColumns"/> <include refid="officeColumns"/>
FROM sys_office a FROM ct_bbtc_sys_office a
<include refid="officeJoins"/> <include refid="officeJoins"/>
WHERE a.del_flag = #{DEL_FLAG_NORMAL} AND a.parent_ids LIKE #{parentIds} WHERE a.del_flag = #{DEL_FLAG_NORMAL} AND a.parent_ids LIKE #{parentIds}
ORDER BY a.code ORDER BY a.code
...@@ -85,7 +85,7 @@ ...@@ -85,7 +85,7 @@
<select id="findByParentId" resultType="Office"> <select id="findByParentId" resultType="Office">
SELECT SELECT
<include refid="officeColumns"/> <include refid="officeColumns"/>
FROM sys_office a FROM ct_bbtc_sys_office a
<include refid="officeJoins"/> <include refid="officeJoins"/>
WHERE a.del_flag = #{DEL_FLAG_NORMAL} AND a.parent_id = #{parent.id} WHERE a.del_flag = #{DEL_FLAG_NORMAL} AND a.parent_id = #{parent.id}
ORDER BY a.code ORDER BY a.code
...@@ -94,22 +94,23 @@ ...@@ -94,22 +94,23 @@
<select id="findByOfficeName" resultType="Office"> <select id="findByOfficeName" resultType="Office">
SELECT SELECT
<include refid="officeColumns"/> <include refid="officeColumns"/>
FROM sys_office a FROM ct_bbtc_sys_office a
<include refid="officeJoins"/> <include refid="officeJoins"/>
WHERE a.del_flag = '0' AND a.name = #{officeName} WHERE a.del_flag = '0' AND a.name = #{officeName}
</select> </select>
<select id="getCompany" resultType="Office"> <select id="getCompany" parameterType="Office" resultType="Office">
SELECT SELECT
<include refid="officeColumns"/> <include refid="officeColumns"/>
FROM sys_office a FROM ct_bbtc_sys_office a
<include refid="officeJoins"/> <include refid="officeJoins"/>
WHERE a.del_flag = #{DEL_FLAG_NORMAL} AND a.parent_id='1' WHERE a.del_flag = #{DEL_FLAG_NORMAL} AND a.parent_id='1'
limit 1 <if test="dbName == 'oracle'"> AND rownum &lt;= 1</if>
<if test="dbName == 'mysql'"> limit 1</if>
</select> </select>
<insert id="insert"> <insert id="insert">
INSERT INTO sys_office( INSERT INTO ct_bbtc_sys_office(
id, id,
parent_id, parent_id,
parent_ids, parent_ids,
...@@ -163,7 +164,7 @@ ...@@ -163,7 +164,7 @@
</insert> </insert>
<update id="update"> <update id="update">
UPDATE sys_office SET UPDATE ct_bbtc_sys_office SET
parent_id = #{parent.id}, parent_id = #{parent.id},
parent_ids = #{parentIds}, parent_ids = #{parentIds},
area_id = #{area.id}, area_id = #{area.id},
...@@ -187,14 +188,14 @@ ...@@ -187,14 +188,14 @@
</update> </update>
<update id="updateParentIds"> <update id="updateParentIds">
UPDATE sys_office SET UPDATE ct_bbtc_sys_office SET
parent_id = #{parent.id}, parent_id = #{parent.id},
parent_ids = #{parentIds} parent_ids = #{parentIds}
WHERE id = #{id} WHERE id = #{id}
</update> </update>
<update id="delete"> <update id="delete">
UPDATE sys_office SET UPDATE ct_bbtc_sys_office SET
del_flag = #{DEL_FLAG_DELETE} del_flag = #{DEL_FLAG_DELETE}
WHERE id = #{id} OR parent_ids LIKE WHERE id = #{id} OR parent_ids LIKE
<if test="dbName == 'oracle'">'%,'||#{id}||',%'</if> <if test="dbName == 'oracle'">'%,'||#{id}||',%'</if>
......
target/report_sunac/WEB-INF/classes/mappings/modules/sys/RoleDao.xml
...@@ -62,16 +62,16 @@ ...@@ -62,16 +62,16 @@
uo.name AS "userList.office.name", --> uo.name AS "userList.office.name", -->
rm.menu_id AS "menuList.id", rm.menu_id AS "menuList.id",
ro.office_id AS "officeList.id" ro.office_id AS "officeList.id"
FROM sys_role a FROM ct_bbtc_sys_role a
LEFT JOIN sys_office o LEFT JOIN ct_bbtc_sys_office o
ON o.id = a.office_id<!-- ON o.id = a.office_id<!--
LEFT JOIN sys_user2role ur ON ur.role_id = a.id LEFT JOIN ct_bbtc_sys_user2role ur ON ur.role_id = a.id
LEFT JOIN sys_user u ON u.id = ur.user_id LEFT JOIN ct_bbtc_sys_user u ON u.id = ur.user_id
LEFT JOIN sys_office uc ON uc.id = u.company_id LEFT JOIN ct_bbtc_sys_office uc ON uc.id = u.company_id
LEFT JOIN sys_office uo ON uo.id = u.office_id --> LEFT JOIN ct_bbtc_sys_office uo ON uo.id = u.office_id -->
LEFT JOIN sys_menu2role rm LEFT JOIN ct_bbtc_sys_menu2role rm
ON rm.role_id = a.id ON rm.role_id = a.id
LEFT JOIN sys_office2role ro LEFT JOIN ct_bbtc_sys_office2role ro
ON ro.role_id = a.id ON ro.role_id = a.id
WHERE a.id = #{id} WHERE a.id = #{id}
</select> </select>
...@@ -79,16 +79,16 @@ ...@@ -79,16 +79,16 @@
<select id="getByName" resultType="Role"> <select id="getByName" resultType="Role">
SELECT SELECT
<include refid="roleColumns"/> <include refid="roleColumns"/>
FROM sys_role a FROM ct_bbtc_sys_role a
JOIN sys_office o ON o.id = a.office_id JOIN ct_bbtc_sys_office o ON o.id = a.office_id
WHERE a.name = #{name} AND a.del_flag = #{DEL_FLAG_NORMAL} WHERE a.name = #{name} AND a.del_flag = #{DEL_FLAG_NORMAL}
</select> </select>
<select id="getByEnname" resultType="Role"> <select id="getByEnname" resultType="Role">
SELECT SELECT
<include refid="roleColumns"/> <include refid="roleColumns"/>
FROM sys_role a FROM ct_bbtc_sys_role a
JOIN sys_office o ON o.id = a.office_id JOIN ct_bbtc_sys_office o ON o.id = a.office_id
WHERE a.enname = #{enname} AND a.del_flag = #{DEL_FLAG_NORMAL} WHERE a.enname = #{enname} AND a.del_flag = #{DEL_FLAG_NORMAL}
</select> </select>
...@@ -96,11 +96,11 @@ ...@@ -96,11 +96,11 @@
SELECT <!-- DISTINCT --> SELECT <!-- DISTINCT -->
<include refid="roleColumns"/>, <include refid="roleColumns"/>,
ro.office_id AS "officeList.id" ro.office_id AS "officeList.id"
FROM sys_role a FROM ct_bbtc_sys_role a
LEFT JOIN sys_office o ON o.id = a.office_id LEFT JOIN ct_bbtc_sys_office o ON o.id = a.office_id
LEFT JOIN sys_user2role ur ON ur.role_id = a.id LEFT JOIN ct_bbtc_sys_user2role ur ON ur.role_id = a.id
LEFT JOIN sys_user u ON u.id = ur.user_id LEFT JOIN ct_bbtc_sys_user u ON u.id = ur.user_id
LEFT JOIN sys_office2role ro ON ro.role_id = a.id LEFT JOIN ct_bbtc_sys_office2role ro ON ro.role_id = a.id
WHERE a.del_flag = #{DEL_FLAG_NORMAL} AND a.useable=#{useable} WHERE a.del_flag = #{DEL_FLAG_NORMAL} AND a.useable=#{useable}
<if test="user != null and user.id != null and user.id != ''"> <if test="user != null and user.id != null and user.id != ''">
AND u.id = #{user.id} AND u.id = #{user.id}
...@@ -116,8 +116,8 @@ ...@@ -116,8 +116,8 @@
<select id="findAllList" resultType="Role"> <select id="findAllList" resultType="Role">
SELECT SELECT
<include refid="roleColumns"/> <include refid="roleColumns"/>
FROM sys_role a FROM ct_bbtc_sys_role a
LEFT JOIN sys_office o ON o.id = a.office_id LEFT JOIN ct_bbtc_sys_office o ON o.id = a.office_id
WHERE a.del_flag = #{DEL_FLAG_NORMAL} WHERE a.del_flag = #{DEL_FLAG_NORMAL}
<if test="unChecked != null and unChecked != ''"> <if test="unChecked != null and unChecked != ''">
AND a.un_checked = #{unChecked} AND a.un_checked = #{unChecked}
...@@ -126,7 +126,7 @@ ...@@ -126,7 +126,7 @@
</select> </select>
<insert id="insert"> <insert id="insert">
INSERT INTO sys_role( INSERT INTO ct_bbtc_sys_role(
id, id,
office_id, office_id,
name, name,
...@@ -160,7 +160,7 @@ ...@@ -160,7 +160,7 @@
</insert> </insert>
<update id="update"> <update id="update">
UPDATE sys_role SET UPDATE ct_bbtc_sys_role SET
office_id = #{office.id}, office_id = #{office.id},
name = #{name}, name = #{name},
enname = #{enname}, enname = #{enname},
...@@ -175,11 +175,11 @@ ...@@ -175,11 +175,11 @@
</update> </update>
<delete id="deleteRoleMenu"> <delete id="deleteRoleMenu">
DELETE FROM sys_menu2role WHERE role_id = #{id} DELETE FROM ct_bbtc_sys_menu2role WHERE role_id = #{id}
</delete> </delete>
<insert id="insertRoleMenu"> <insert id="insertRoleMenu">
INSERT INTO sys_menu2role(role_id, menu_id) INSERT INTO ct_bbtc_sys_menu2role(role_id, menu_id)
<foreach collection="menuList" item="menu" separator=" union all "> <foreach collection="menuList" item="menu" separator=" union all ">
SELECT #{id}, #{menu.id} SELECT #{id}, #{menu.id}
<if test="dbName != 'mssql'"> <if test="dbName != 'mssql'">
...@@ -189,11 +189,11 @@ ...@@ -189,11 +189,11 @@
</insert> </insert>
<delete id="deleteRoleOffice"> <delete id="deleteRoleOffice">
DELETE FROM sys_office2role WHERE role_id = #{id} DELETE FROM ct_bbtc_sys_office2role WHERE role_id = #{id}
</delete> </delete>
<insert id="insertRoleOffice"> <insert id="insertRoleOffice">
INSERT INTO sys_office2role(role_id, office_id) INSERT INTO ct_bbtc_sys_office2role(role_id, office_id)
<foreach collection="officeList" item="office" separator=" union all "> <foreach collection="officeList" item="office" separator=" union all ">
SELECT #{id}, #{office.id} SELECT #{id}, #{office.id}
<if test="dbName != 'mssql'"> <if test="dbName != 'mssql'">
...@@ -203,7 +203,7 @@ ...@@ -203,7 +203,7 @@
</insert> </insert>
<update id="delete"> <update id="delete">
UPDATE sys_role SET UPDATE ct_bbtc_sys_role SET
del_flag = #{DEL_FLAG_DELETE} del_flag = #{DEL_FLAG_DELETE}
WHERE id = #{id} WHERE id = #{id}
</update> </update>
......
target/report_sunac/WEB-INF/classes/mappings/modules/sys/UserDao.xml
...@@ -111,23 +111,23 @@ ...@@ -111,23 +111,23 @@
</sql> </sql>
<sql id="userJoins"> <sql id="userJoins">
LEFT JOIN sys_office c ON c.id = a.company_id LEFT JOIN ct_bbtc_sys_office c ON c.id = a.company_id
LEFT JOIN sys_area ca ON ca.id = c.area_id LEFT JOIN ct_bbtc_sys_area ca ON ca.id = c.area_id
LEFT JOIN sys_office o ON o.id = a.office_id LEFT JOIN ct_bbtc_sys_office o ON o.id = a.office_id
LEFT JOIN sys_area oa ON oa.id = o.area_id LEFT JOIN ct_bbtc_sys_area oa ON oa.id = o.area_id
LEFT JOIN sys_user cu ON cu.id = c.primary_person LEFT JOIN ct_bbtc_sys_user cu ON cu.id = c.primary_person
LEFT JOIN sys_user cu2 ON cu2.id = c.deputy_person LEFT JOIN ct_bbtc_sys_user cu2 ON cu2.id = c.deputy_person
LEFT JOIN sys_user ou ON ou.id = o.primary_person LEFT JOIN ct_bbtc_sys_user ou ON ou.id = o.primary_person
LEFT JOIN sys_user ou2 ON ou2.id = o.deputy_person<!-- LEFT JOIN ct_bbtc_sys_user ou2 ON ou2.id = o.deputy_person<!--
LEFT JOIN sys_user2role ur ON ur.user_id = a.id LEFT JOIN ct_bbtc_sys_user2role ur ON ur.user_id = a.id
LEFT JOIN sys_role r ON r.id = ur.role_id --> LEFT JOIN ct_bbtc_sys_role r ON r.id = ur.role_id -->
</sql> </sql>
<!-- 根据编号获得用户 --> <!-- 根据编号获得用户 -->
<select id="get" resultType="User"> <select id="get" resultType="User">
SELECT SELECT
<include refid="userColumns"/> <include refid="userColumns"/>
FROM sys_user a FROM ct_bbtc_sys_user a
<include refid="userJoins"/> <include refid="userJoins"/>
WHERE a.id = #{id} WHERE a.id = #{id}
</select> </select>
...@@ -137,9 +137,9 @@ ...@@ -137,9 +137,9 @@
SELECT SELECT
<include refid="userColumns"/><!-- , <include refid="userColumns"/><!-- ,
ro.office_id AS "roleList.officeList.id" --> ro.office_id AS "roleList.officeList.id" -->
FROM sys_user a FROM ct_bbtc_sys_user a
<include refid="userJoins"/><!-- <include refid="userJoins"/><!--
LEFT JOIN sys_office2role ro ON ro.role_id = r.id --> LEFT JOIN ct_bbtc_sys_office2role ro ON ro.role_id = r.id -->
WHERE a.login_name = #{loginName} AND a.del_flag = #{DEL_FLAG_NORMAL} WHERE a.login_name = #{loginName} AND a.del_flag = #{DEL_FLAG_NORMAL}
</select> </select>
...@@ -148,13 +148,13 @@ ...@@ -148,13 +148,13 @@
SELECT SELECT
role.id AS roleId, role.id AS roleId,
<include refid="userColumns"/> <include refid="userColumns"/>
FROM sys_user a FROM ct_bbtc_sys_user a
<include refid="userJoins"/> <include refid="userJoins"/>
<if test="role != null and role.id != null and role.id != ''"> <if test="role != null and role.id != null and role.id != ''">
JOIN sys_user2role ur ON ur.user_id = a.id AND ur.role_id = #{role.id} JOIN ct_bbtc_sys_user2role ur ON ur.user_id = a.id AND ur.role_id = #{role.id}
</if> </if>
LEFT JOIN sys_user2role ur ON ur.user_id = a.id LEFT JOIN ct_bbtc_sys_user2role ur ON ur.user_id = a.id
LEFT JOIN sys_role role ON ur.role_id = role.id LEFT JOIN ct_bbtc_sys_role role ON ur.role_id = role.id
WHERE a.del_flag = #{DEL_FLAG_NORMAL} WHERE a.del_flag = #{DEL_FLAG_NORMAL}
<if test="company != null and company.id != null and company.id != ''"> <if test="company != null and company.id != null and company.id != ''">
AND (c.id = #{company.id} OR c.parent_ids LIKE AND (c.id = #{company.id} OR c.parent_ids LIKE
...@@ -200,7 +200,7 @@ ...@@ -200,7 +200,7 @@
<select id="findUserByOfficeId" resultType="User" useCache="true"> <select id="findUserByOfficeId" resultType="User" useCache="true">
SELECT SELECT
a.id, a.name, a.login_name a.id, a.name, a.login_name
FROM sys_user a FROM ct_bbtc_sys_user a
WHERE a.del_flag = #{DEL_FLAG_NORMAL} WHERE a.del_flag = #{DEL_FLAG_NORMAL}
AND a.office_id = #{office.id} AND a.office_id = #{office.id}
ORDER BY a.name ORDER BY a.name
...@@ -210,7 +210,7 @@ ...@@ -210,7 +210,7 @@
<select id="findAllList" resultType="User"> <select id="findAllList" resultType="User">
SELECT SELECT
<include refid="userColumns"/> <include refid="userColumns"/>
FROM sys_user a FROM ct_bbtc_sys_user a
<include refid="userJoins"/> <include refid="userJoins"/>
WHERE a.del_flag = #{DEL_FLAG_NORMAL} WHERE a.del_flag = #{DEL_FLAG_NORMAL}
ORDER BY c.code, o.code, a.name ORDER BY c.code, o.code, a.name
...@@ -220,13 +220,13 @@ ...@@ -220,13 +220,13 @@
<select id="findAllCount" resultType="long"> <select id="findAllCount" resultType="long">
SELECT SELECT
COUNT(1) COUNT(1)
FROM sys_user a FROM ct_bbtc_sys_user a
WHERE a.del_flag = #{DEL_FLAG_NORMAL} WHERE a.del_flag = #{DEL_FLAG_NORMAL}
</select> </select>
<!-- 插入用户 --> <!-- 插入用户 -->
<insert id="insert"> <insert id="insert">
INSERT INTO sys_user( INSERT INTO ct_bbtc_sys_user(
id, id,
company_id, company_id,
office_id, office_id,
...@@ -269,7 +269,7 @@ ...@@ -269,7 +269,7 @@
) )
</insert> </insert>
<insert id="insertOfficeName"> <insert id="insertOfficeName">
INSERT INTO sys_user_profiles( INSERT INTO ct_bbtc_sys_user_profiles(
user_id, user_id,
office_name, office_name,
device_update device_update
...@@ -281,7 +281,7 @@ ...@@ -281,7 +281,7 @@
</insert> </insert>
<!-- 更新用户 --> <!-- 更新用户 -->
<update id="update"> <update id="update">
UPDATE sys_user SET UPDATE ct_bbtc_sys_user SET
company_id = #{company.id}, company_id = #{company.id},
office_id = #{office.id}, office_id = #{office.id},
login_name = #{loginName}, login_name = #{loginName},
...@@ -302,12 +302,12 @@ ...@@ -302,12 +302,12 @@
<!-- 删除用户和角色关联表数据 --> <!-- 删除用户和角色关联表数据 -->
<delete id="deleteUserRole"> <delete id="deleteUserRole">
DELETE FROM sys_user2role WHERE user_id = #{id} DELETE FROM ct_bbtc_sys_user2role WHERE user_id = #{id}
</delete> </delete>
<!-- 插入用户和角色关联表数据 --> <!-- 插入用户和角色关联表数据 -->
<insert id="insertUserRole"> <insert id="insertUserRole">
INSERT INTO sys_user2role(user_id, role_id) INSERT INTO ct_bbtc_sys_user2role(user_id, role_id)
<foreach collection="roleList" item="role" separator=" union all "> <foreach collection="roleList" item="role" separator=" union all ">
SELECT #{id}, #{role.id} SELECT #{id}, #{role.id}
<if test="dbName != 'mssql'"> <if test="dbName != 'mssql'">
...@@ -318,7 +318,7 @@ ...@@ -318,7 +318,7 @@
<!-- 更新用户信息 --> <!-- 更新用户信息 -->
<update id="updateUserInfo"> <update id="updateUserInfo">
UPDATE sys_user SET UPDATE ct_bbtc_sys_user SET
email = #{email}, email = #{email},
phone = #{phone}, phone = #{phone},
mobile = #{mobile}, mobile = #{mobile},
...@@ -331,14 +331,14 @@ ...@@ -331,14 +331,14 @@
<!-- 更新用户密码 --> <!-- 更新用户密码 -->
<update id="updatePasswordById"> <update id="updatePasswordById">
UPDATE sys_user SET UPDATE ct_bbtc_sys_user SET
password = #{password} password = #{password}
WHERE id = #{id} WHERE id = #{id}
</update> </update>
<!-- 更新登录信息，如登录IP、登录时间 --> <!-- 更新登录信息，如登录IP、登录时间 -->
<update id="updateLoginInfo"> <update id="updateLoginInfo">
UPDATE sys_user SET UPDATE ct_bbtc_sys_user SET
login_ip = #{loginIp}, login_ip = #{loginIp},
login_Date = #{loginDate} login_Date = #{loginDate}
WHERE id = #{id} WHERE id = #{id}
...@@ -346,7 +346,7 @@ ...@@ -346,7 +346,7 @@
<!-- 逻辑删除用户 --> <!-- 逻辑删除用户 -->
<update id="delete"> <update id="delete">
UPDATE sys_user SET UPDATE ct_bbtc_sys_user SET
del_flag = #{DEL_FLAG_DELETE} del_flag = #{DEL_FLAG_DELETE}
WHERE id = #{id} WHERE id = #{id}
</update> </update>
......
target/report_sunac/WEB-INF/classes/mappings/modules/upload/UploadDao.xml
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
orientation orientation
</sql> </sql>
<insert id="addUploadFile" useGeneratedKeys="true" keyProperty="id"> <insert id="addUploadFile" useGeneratedKeys="true" keyProperty="id">
INSERT INTO upload_files( INSERT INTO ct_bbtc_upload_files(
<include refid="fileColumns"/> <include refid="fileColumns"/>
) VALUES( ) VALUES(
#{fileId}, #{fileId},
...@@ -43,7 +43,9 @@ ...@@ -43,7 +43,9 @@
</insert> </insert>
<select id="getFileByPath" resultType="com.ejweb.modules.upload.entity.UploadEntity"> <select id="getFileByPath" resultType="com.ejweb.modules.upload.entity.UploadEntity">
SELECT orientation FROM upload_files SELECT orientation FROM ct_bbtc_upload_files
WHERE #{path} LIKE CONCAT('%', path, '%') WHERE #{path} LIKE
<if test="dbName == 'oracle'"> '%'|| path|| '%'</if>
<if test="dbName == 'mysql'"> CONCAT('%', path, '%')</if>
</select> </select>
</mapper> </mapper>
\ No newline at end of file
target/report_sunac/WEB-INF/classes/spring-mvc.xml
...@@ -139,8 +139,8 @@ ...@@ -139,8 +139,8 @@
<!-- 支持Shiro对Controller的方法级AOP安全控制 end --> <!-- 支持Shiro对Controller的方法级AOP安全控制 end -->
<!-- 上传文件拦截，设置最大上传文件大小 10M=10*1024*1024(B)=10485760 bytes --> <!-- 上传文件拦截，设置最大上传文件大小 10M=10*1024*1024(B)=10485760 bytes -->
<bean id="multipartResolver" class="com.ejweb.core.filter.BaiduCommonsMultipartResolver"> <!--<bean id="multipartResolver" class="com.ejweb.core.filter.BaiduCommonsMultipartResolver">
<property name="maxUploadSize" value="${web.maxUploadSize}" /> <property name="maxUploadSize" value="${web.maxUploadSize}" />
</bean> </bean>-->
</beans> </beans>
\ No newline at end of file
target/report_sunac/WEB-INF/tags/sys/validateCode.tag
...@@ -5,5 +5,5 @@ ...@@ -5,5 +5,5 @@
<%@ attribute name="imageCssStyle" type="java.lang.String" required="false" description="验证码图片样式"%> <%@ attribute name="imageCssStyle" type="java.lang.String" required="false" description="验证码图片样式"%>
<%@ attribute name="buttonCssStyle" type="java.lang.String" required="false" description="看不清按钮样式"%> <%@ attribute name="buttonCssStyle" type="java.lang.String" required="false" description="看不清按钮样式"%>
<input type="text" id="${name}" name="${name}" maxlength="5" class="txt required" style="font-weight:bold;width:45px;${inputCssStyle}"/> <input type="text" id="${name}" name="${name}" maxlength="5" class="txt required" style="font-weight:bold;width:45px;${inputCssStyle}"/>
<img src="${pageContext.request.contextPath}/servlet/validateCodeServlet" onclick="$('.${name}Refresh').click();" class="mid ${name}" style="${imageCssStyle}"/> <img src="${pageContext.request.contextPath}/servlet/validateCodeServlet1" onclick="$('.${name}Refresh').click();" class="mid ${name}" style="${imageCssStyle}"/>
<a href="javascript:" onclick="$('.${name}').attr('src','${pageContext.request.contextPath}/servlet/validateCodeServlet?'+new Date().getTime());" class="mid ${name}Refresh" style="${buttonCssStyle}">看不清</a> <a href="javascript:" onclick="$('.${name}').attr('src','${pageContext.request.contextPath}/servlet/validateCodeServlet1?'+new Date().getTime());" class="mid ${name}Refresh" style="${buttonCssStyle}">看不清</a>
\ No newline at end of file \ No newline at end of file
target/report_sunac/WEB-INF/views/modules/sys/menuTree.jsp
...@@ -27,6 +27,14 @@ ...@@ -27,6 +27,14 @@
</script> </script>
</head> </head>
<body> --%> <body> --%>
<script type="text/javascript">
function showMessage() {
var result = "${result}";
if (result == "") {
$("#messageDiv").hide();
}
}
</script>
<div class="accordion" id="menu-${param.parentId}"> <div class="accordion" id="menu-${param.parentId}">
<c:set var="menuList" value="${fns:getMenuList()}"/><c:set var="firstMenu" value="true"/> <c:set var="menuList" value="${fns:getMenuList()}"/><c:set var="firstMenu" value="true"/>
<c:forEach items="${menuList}" var="menu" varStatus="idxStatus"> <c:forEach items="${menuList}" var="menu" varStatus="idxStatus">
...@@ -35,8 +43,14 @@ ...@@ -35,8 +43,14 @@
<c:if test="${(fns:getUser().admin && menu.id ne '81687207761300463255') || (!fns:getUser().admin)}"> <c:if test="${(fns:getUser().admin && menu.id ne '81687207761300463255') || (!fns:getUser().admin)}">
<!-- --> <!-- -->
<div class="accordion-group"> <div class="accordion-group">
<div class="accordion-heading"> <div class="accordion-heading" style="position:relative;"><div>
<a class="accordion-toggle" data-toggle="collapse" data-parent="#menu-${param.parentId}" data-href="#collapse-${menu.id}" href="#collapse-${menu.id}" title="${menu.remarks}"><i class="icon-chevron-${not empty firstMenu && firstMenu ? 'down' : 'right'}"></i>&nbsp;${menu.name}</a> <a class="accordion-toggle" data-toggle="collapse" data-parent="#menu-${param.parentId}" data-href="#collapse-${menu.id}" href="#collapse-${menu.id}" title="${menu.remarks}">
<i class="icon-chevron-${not empty firstMenu && firstMenu ? 'down' : 'right'}"></i>&nbsp;${menu.name}</a></div>
<c:if test="${menu.name eq '消息中心'}">
<div id="messageDiv" style="position:absolute;right:20px;top:10px;width:15px; height:15px; background-color:#F00; border-radius:25px;">
<span id="promptMessage" style="height:15px; line-height:15px; display:block; color:#FFF; text-align:center">${result}</span>
</div>
</c:if>
</div> </div>
<div id="collapse-${menu.id}" class="accordion-body collapse ${not empty firstMenu && firstMenu ? 'in' : ''}"> <div id="collapse-${menu.id}" class="accordion-body collapse ${not empty firstMenu && firstMenu ? 'in' : ''}">
<div class="accordion-inner"> <div class="accordion-inner">
...@@ -61,6 +75,8 @@ ...@@ -61,6 +75,8 @@
</div> </div>
</c:if> </c:if>
</c:if> </c:if>
</c:forEach></div><%-- </c:forEach></div>
<img hidden src="about:blank" onerror="showMessage();">
<%--
</body> </body>
</html> --%> </html> --%>
\ No newline at end of file
target/report_sunac/WEB-INF/views/modules/sys/sysIndex.jsp
...@@ -125,6 +125,23 @@ ...@@ -125,6 +125,23 @@
$(this).click(); $(this).click();
} }
}); });
$.ajax({
url: "${ctx}/notice/prompt",
dataType: "text",
traditional: true,//这里设置为true
cache: false,
success: function(result) { //登录成功后返回的数据
if (result != "") {
$("#prompt").text(result);
$("#message").show();
}else {
$("#message").hide();
}
},
error:function(){
alert("系统错误！");
}
});
}); });
// <c:if test="${tabmode eq '1'}"> 添加一个页签 // <c:if test="${tabmode eq '1'}"> 添加一个页签
function addTab($this, refresh){ function addTab($this, refresh){
...@@ -141,6 +158,15 @@ ...@@ -141,6 +158,15 @@
}).loadData(refresh); }).loadData(refresh);
return false; return false;
}// </c:if> }// </c:if>
function refreshPromt(result) {
if (result != "") {
$("#prompt").text(result);
$("#promptMessage").text(result);
}else {
$("#message").hide();
$("#messageDiv").hide();
}
}
</script> </script>
</head> </head>
<body> <body>
...@@ -164,7 +190,7 @@ ...@@ -164,7 +190,7 @@
<li><a href="${ctx}/sys/user/modifyPwd" target="mainFrame"><i class="icon-lock"></i>&nbsp; 修改密码</a></li> <li><a href="${ctx}/sys/user/modifyPwd" target="mainFrame"><i class="icon-lock"></i>&nbsp; 修改密码</a></li>
</ul>--%> </ul>--%>
</li> </li>
<c:if test="${fns:getUser().id eq '1'}"><li><a href="${ctx}/logout" title="退出登录">退出</a></li></c:if> <%--<c:if test="${fns:getUser().id eq '1'}"><li><a href="${ctx}/logout" title="退出登录">退出</a></li></c:if>--%>
<li>&nbsp;</li> <li>&nbsp;</li>
</ul> </ul>
<%-- <c:if test="${cookie.theme.value eq 'cerulean'}"> <%-- <c:if test="${cookie.theme.value eq 'cerulean'}">
...@@ -183,7 +209,12 @@ ...@@ -183,7 +209,12 @@
<c:if test="${menu.parent.id eq '1'&&menu.isShow eq '1'}"> <c:if test="${menu.parent.id eq '1'&&menu.isShow eq '1'}">
<li class="menu ${not empty firstMenu && firstMenu ? ' active' : ''}"> <li class="menu ${not empty firstMenu && firstMenu ? ' active' : ''}">
<c:if test="${empty menu.href}"> <c:if test="${empty menu.href}">
<a class="menu" href="javascript:" data-href="${ctx}/sys/menu/tree?parentId=${menu.id}" data-id="${menu.id}"><span>${menu.name}</span></a> <a class="menu" href="javascript:" data-href="${ctx}/sys/menu/tree?parentId=${menu.id}" data-id="${menu.id}"><div style="position:relative;"><div><span>${menu.name}</span></div>
<c:if test="${menu.name eq '工作台'}">
<div id="message" style="position:absolute;right:-10px;top:-10px;width:15px; height:15px; background-color:#F00; border-radius:25px;display:none;">
<span id="prompt" style="height:15px; line-height:15px; display:block; color:#FFF; text-align:center"></span>
</div>
</c:if></div></a>
</c:if> </c:if>
<c:if test="${not empty menu.href}"> <c:if test="${not empty menu.href}">
<a class="menu" href="${fn:indexOf(menu.href, '://') eq -1 ? ctx : ''}${menu.href}" data-id="${menu.id}" target="mainFrame"><span>${menu.name}</span></a> <a class="menu" href="${fn:indexOf(menu.href, '://') eq -1 ? ctx : ''}${menu.href}" data-id="${menu.id}" target="mainFrame"><span>${menu.name}</span></a>
......
target/report_sunac/WEB-INF/views/modules/sys/sysIndex2.jsp
...@@ -148,7 +148,7 @@ ...@@ -148,7 +148,7 @@
<li><a href="${ctx}/sys/user/modifyPwd" target="mainFrame"><i class="icon-lock"></i>&nbsp; 修改密码</a></li> <li><a href="${ctx}/sys/user/modifyPwd" target="mainFrame"><i class="icon-lock"></i>&nbsp; 修改密码</a></li>
</ul>--%> </ul>--%>
</li> </li>
<li><a href="${ctx}/logout" title="退出登录">退出</a></li> <li><%--<a href="${ctx}/logout" title="退出登录">退出</a>--%></li>
<li>&nbsp;</li> <li>&nbsp;</li>
</ul> </ul>
<%--<c:if test="${cookie.theme.value eq 'cerulean'}"> --%> <%--<c:if test="${cookie.theme.value eq 'cerulean'}"> --%>
......
target/report_sunac/WEB-INF/views/modules/sys/sysLogin.jsp
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
$(document).ready(function() { $(document).ready(function() {
$("#loginForm").validate({ $("#loginForm").validate({
rules: { rules: {
validateCode: {remote: "${pageContext.request.contextPath}/servlet/validateCodeServlet"} validateCode: {remote: "${pageContext.request.contextPath}/servlet/validateCodeServlet1"}
}, },
messages: { messages: {
username: {required: "请填写用户名."},password: {required: "请填写密码."}, username: {required: "请填写用户名."},password: {required: "请填写密码."},
......
target/report_sunac/WEB-INF/views/modules/sys/userForm.jsp
...@@ -40,13 +40,13 @@ ...@@ -40,13 +40,13 @@
<form:form id="inputForm" modelAttribute="user" action="${ctx}/sys/user/save" method="post" class="form-horizontal"> <form:form id="inputForm" modelAttribute="user" action="${ctx}/sys/user/save" method="post" class="form-horizontal">
<form:hidden path="id"/> <form:hidden path="id"/>
<sys:message content="${message}"/> <sys:message content="${message}"/>
<div class="control-group"> <%--<div class="control-group">
<label class="control-label">头像:</label> <label class="control-label">头像:</label>
<div class="controls"> <div class="controls">
<form:hidden id="nameImage" path="photo" htmlEscape="false" maxlength="255" class="input-xlarge"/> <form:hidden id="nameImage" path="photo" htmlEscape="false" maxlength="255" class="input-xlarge"/>
<sys:ckfinder input="nameImage" type="images" uploadPath="/photo" selectMultiple="false" maxWidth="100" maxHeight="100"/> <sys:ckfinder input="nameImage" type="images" uploadPath="/photo" selectMultiple="false" maxWidth="100" maxHeight="100"/>
</div> </div>
</div> </div>--%>
<%--<div class="control-group"> <%--<div class="control-group">
<label class="control-label">归属公司:</label> <label class="control-label">归属公司:</label>
<div class="controls"> <div class="controls">
...@@ -61,13 +61,13 @@ ...@@ -61,13 +61,13 @@
title="部门" url="/sys/office/treeData?type=2" notAllowSelectParent="true"/> title="部门" url="/sys/office/treeData?type=2" notAllowSelectParent="true"/>
</div> </div>
</div>--%> </div>--%>
<div class="control-group"> <%--<div class="control-group">
<label class="control-label">工号:</label> <label class="control-label">工号:</label>
<div class="controls"> <div class="controls">
<form:input path="no" htmlEscape="false" maxlength="50" class="required"/> <form:input path="no" htmlEscape="false" maxlength="50" class="required"/>
<span class="help-inline"><font color="red">*</font> </span> <span class="help-inline"><font color="red">*</font> </span>
</div> </div>
</div> </div>--%>
<div class="control-group"> <div class="control-group">
<label class="control-label">姓名:</label> <label class="control-label">姓名:</label>
<div class="controls"> <div class="controls">
...@@ -83,7 +83,7 @@ ...@@ -83,7 +83,7 @@
<span class="help-inline"><font color="red">*</font> </span> <span class="help-inline"><font color="red">*</font> </span>
</div> </div>
</div> </div>
<div class="control-group"> <%--<div class="control-group">
<label class="control-label">密码:</label> <label class="control-label">密码:</label>
<div class="controls"> <div class="controls">
<input id="newPassword" name="newPassword" type="password" value="" maxlength="50" minlength="3" class="${empty user.id?'required':''}"/> <input id="newPassword" name="newPassword" type="password" value="" maxlength="50" minlength="3" class="${empty user.id?'required':''}"/>
...@@ -124,7 +124,7 @@ ...@@ -124,7 +124,7 @@
</form:select> </form:select>
<span class="help-inline"><font color="red">*</font> “是”代表此账号允许登录，“否”则表示此账号不允许登录</span> <span class="help-inline"><font color="red">*</font> “是”代表此账号允许登录，“否”则表示此账号不允许登录</span>
</div> </div>
</div> </div>--%>
<%-- <div class="control-group"> <%-- <div class="control-group">
<label class="control-label">用户类型:</label> <label class="control-label">用户类型:</label>
<div class="controls"> <div class="controls">
...@@ -141,7 +141,7 @@ ...@@ -141,7 +141,7 @@
<span class="help-inline"><font color="red">*</font> </span> <span class="help-inline"><font color="red">*</font> </span>
</div> </div>
</div> </div>
<div class="control-group"> <%--<div class="control-group">
<label class="control-label">备注:</label> <label class="control-label">备注:</label>
<div class="controls"> <div class="controls">
<form:textarea path="remarks" htmlEscape="false" rows="3" maxlength="200" class="input-xlarge"/> <form:textarea path="remarks" htmlEscape="false" rows="3" maxlength="200" class="input-xlarge"/>
...@@ -160,7 +160,7 @@ ...@@ -160,7 +160,7 @@
<label class="lbl">IP: ${user.loginIp}&nbsp;&nbsp;&nbsp;&nbsp;时间：<fmt:formatDate value="${user.loginDate}" type="both" dateStyle="full"/></label> <label class="lbl">IP: ${user.loginIp}&nbsp;&nbsp;&nbsp;&nbsp;时间：<fmt:formatDate value="${user.loginDate}" type="both" dateStyle="full"/></label>
</div> </div>
</div> </div>
</c:if> </c:if>--%>
<div class="form-actions"> <div class="form-actions">
<shiro:hasPermission name="sys:user:edit"><input id="btnSubmit" class="btn btn-primary" type="submit" value="保 存"/>&nbsp;</shiro:hasPermission> <shiro:hasPermission name="sys:user:edit"><input id="btnSubmit" class="btn btn-primary" type="submit" value="保 存"/>&nbsp;</shiro:hasPermission>
<input id="btnCancel" class="btn" type="button" value="返 回" onclick="history.go(-1)"/> <input id="btnCancel" class="btn" type="button" value="返 回" onclick="history.go(-1)"/>
......
target/report_sunac/WEB-INF/web.xml
...@@ -131,6 +131,16 @@ ...@@ -131,6 +131,16 @@
<filter-name>FileUploadFilter</filter-name> <filter-name>FileUploadFilter</filter-name>
<url-pattern>/assets/ckfinder/core/connector/java/connector.java</url-pattern> <url-pattern>/assets/ckfinder/core/connector/java/connector.java</url-pattern>
</filter-mapping> </filter-mapping>
<filter>
<filter-name>CorsFilter</filter-name>
<filter-class>com.ejweb.core.filter.CORSFilter</filter-class>
</filter>
<filter-mapping>
<filter-name>CorsFilter</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
<servlet> <servlet>
<servlet-name>UserfilesDownloadServlet</servlet-name> <servlet-name>UserfilesDownloadServlet</servlet-name>
<servlet-class>com.ejweb.core.servlet.UserfilesDownloadServlet</servlet-class> <servlet-class>com.ejweb.core.servlet.UserfilesDownloadServlet</servlet-class>
...@@ -145,8 +155,28 @@ ...@@ -145,8 +155,28 @@
</servlet> </servlet>
<servlet-mapping> <servlet-mapping>
<servlet-name>ValidateCodeServlet</servlet-name> <servlet-name>ValidateCodeServlet</servlet-name>
<url-pattern>/servlet/validateCodeServlet</url-pattern> <url-pattern>/api/front/report/validateCodeServlet</url-pattern>
</servlet-mapping>
<servlet>
<servlet-name>ValidateCodeServlet1</servlet-name>
<servlet-class>com.ejweb.core.servlet.ValidateCodeServlet</servlet-class>
</servlet>
<servlet-mapping>
<servlet-name>ValidateCodeServlet1</servlet-name>
<url-pattern>/servlet/validateCodeServlet1</url-pattern>
</servlet-mapping>
<!--验证码-->
<servlet>
<servlet-name>captcha</servlet-name>
<servlet-class>com.ejweb.modules.front.report.servlet.CaptchaServlet</servlet-class>
</servlet>
<servlet-mapping>
<servlet-name>captcha</servlet-name>
<url-pattern>/api/front/report/captcha</url-pattern>
</servlet-mapping> </servlet-mapping>
<error-page> <error-page>
<error-code>500</error-code> <error-code>500</error-code>
<location>/WEB-INF/views/error/500.jsp</location> <location>/WEB-INF/views/error/500.jsp</location>
......
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