Skip to content

S
sunac_report
Commit 1bcfc587 by java-lixy
Options

放开root的退出

parents 41e69f47 9a12fc3b
Showing with 529 additions and 585 deletions
.idea/artifacts/report_sunac_war_exploded.xml
...@@ -46,6 +46,13 @@ ...@@ -46,6 +46,13 @@
<element id="library" level="project" name="Maven: opensymphony:sitemesh:2.4.2" /> <element id="library" level="project" name="Maven: opensymphony:sitemesh:2.4.2" />
<element id="library" level="project" name="Maven: taglibs:standard:1.1.2" /> <element id="library" level="project" name="Maven: taglibs:standard:1.1.2" />
<element id="library" level="project" name="Maven: javax.servlet:jstl:1.2" /> <element id="library" level="project" name="Maven: javax.servlet:jstl:1.2" />
<element id="library" level="project" name="Maven: io.springfox:springfox-swagger-ui:2.6.1" />
<element id="library" level="project" name="Maven: io.springfox:springfox-spring-web:2.6.1" />
<element id="library" level="project" name="Maven: org.springframework.plugin:spring-plugin-core:1.2.0.RELEASE" />
<element id="library" level="project" name="Maven: org.springframework.plugin:spring-plugin-metadata:1.2.0.RELEASE" />
<element id="library" level="project" name="Maven: io.springfox:springfox-spi:2.6.1" />
<element id="library" level="project" name="Maven: io.springfox:springfox-core:2.6.1" />
<element id="library" level="project" name="Maven: io.swagger:swagger-annotations:1.5.16" />
<element id="library" level="project" name="Maven: net.sf.ehcache:ehcache-core:2.6.11" /> <element id="library" level="project" name="Maven: net.sf.ehcache:ehcache-core:2.6.11" />
<element id="library" level="project" name="Maven: net.sf.ehcache:ehcache-web:2.0.4" /> <element id="library" level="project" name="Maven: net.sf.ehcache:ehcache-web:2.0.4" />
<element id="library" level="project" name="Maven: redis.clients:jedis:2.5.1" /> <element id="library" level="project" name="Maven: redis.clients:jedis:2.5.1" />
...@@ -142,6 +149,10 @@ ...@@ -142,6 +149,10 @@
<element id="library" level="project" name="Maven: org.hamcrest:hamcrest-core:1.3" /> <element id="library" level="project" name="Maven: org.hamcrest:hamcrest-core:1.3" />
<element id="library" level="project" name="Maven: org.springframework:spring-test:4.2.2.RELEASE" /> <element id="library" level="project" name="Maven: org.springframework:spring-test:4.2.2.RELEASE" />
<element id="library" level="project" name="Maven: com.kingdee.eas.cp.eip.sso.ltpa:LTPATokenManager:1.0.0" /> <element id="library" level="project" name="Maven: com.kingdee.eas.cp.eip.sso.ltpa:LTPATokenManager:1.0.0" />
<element id="library" level="project" name="Maven: jfree:jfreechart:1.0.13" />
<element id="library" level="project" name="Maven: jfree:jcommon:1.0.16" />
<element id="library" level="project" name="Maven: com.itextpdf:itextpdf:5.5.10" />
<element id="library" level="project" name="Maven: com.itextpdf:itext-asian:5.2.0" />
</element> </element>
</element> </element>
<element id="directory" name="META-INF"> <element id="directory" name="META-INF">
......
.idea/workspace.xml
...@@ -2,11 +2,23 @@ ...@@ -2,11 +2,23 @@
<project version="4"> <project version="4">
<component name="ArtifactsWorkspaceSettings"> <component name="ArtifactsWorkspaceSettings">
<artifacts-to-build> <artifacts-to-build>
<artifact name="it-faq-manage:war" /> <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="放开root的退出">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/artifacts/report_sunac_war_exploded.xml" afterPath="$PROJECT_DIR$/.idea/artifacts/report_sunac_war_exploded.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/report_sunac.iml" afterPath="$PROJECT_DIR$/report_sunac.iml" />
<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 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 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 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 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 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 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 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" />
</list>
<ignored path="it-faq-manage.iws" /> <ignored path="it-faq-manage.iws" />
<ignored path=".idea/workspace.xml" /> <ignored path=".idea/workspace.xml" />
<ignored path="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/" /> <ignored path="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/" />
...@@ -33,71 +45,83 @@ ...@@ -33,71 +45,83 @@
<option name="hideWarnings" value="true" /> <option name="hideWarnings" value="true" />
<option name="HIDE_WARNINGS" value="true" /> <option name="HIDE_WARNINGS" value="true" />
</component> </component>
<component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
<component name="FavoritesManager"> <component name="FavoritesManager">
<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="300">
<file leaf-file-name="jdbc.properties" pinned="false" current-in-tab="true"> <file leaf-file-name="WorkbenchController.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/resources/jdbc.properties"> <entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/workbench/web/WorkbenchController.java">
<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="49">
<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="99" column="0" lean-forward="false" selection-start-line="99" selection-start-column="0" selection-end-line="99" selection-end-column="0" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="SystemService.java" pinned="false" current-in-tab="false"> <file leaf-file-name="WorkbenchService.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/sys/service/SystemService.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/workbench/service/WorkbenchService.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1200"> <state relative-caret-position="-2607">
<caret line="84" column="19" lean-forward="false" selection-start-line="84" selection-start-column="19" selection-end-line="84" selection-end-column="19" /> <caret line="21" column="13" lean-forward="false" selection-start-line="21" selection-start-column="13" selection-end-line="21" selection-end-column="13" />
<folding> <folding />
<element signature="e#2303#2304#0" expanded="true" />
<element signature="e#2361#2362#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="RoleDao.xml" pinned="false" current-in-tab="false"> <file leaf-file-name="ReportDao.xml" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/resources/mappings/modules/sys/RoleDao.xml"> <entry file="file://$PROJECT_DIR$/src/main/resources/mappings/modules/report/ReportDao.xml">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="350"> <state relative-caret-position="462">
<caret line="22" column="25" lean-forward="true" selection-start-line="22" selection-start-column="25" selection-end-line="22" selection-end-column="25" /> <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> <folding>
<marker date="1504679554013" expanded="true" signature="2094:3060" ph="SELECT , rm.... " /> <marker date="1510543225981" expanded="true" signature="1713:1817" ph="SELECT FROM ct_bbtc_report" />
<marker date="1504679554013" expanded="true" signature="3130:3318" ph="SELECT FROM sys_role" /> <marker date="1510543225981" expanded="true" signature="1923:5269" ph="SELECT FROM ct_bbtc_report" />
<marker date="1504679554013" expanded="true" signature="3390:3582" ph="SELECT FROM sys_role" /> <marker date="1510543225981" expanded="true" signature="5822:6047" ph="SELECT sr.na... ct_bbtc_sys_role" />
<marker date="1504679554013" expanded="true" signature="3656:4425" ph="SELECT , ro.... " /> <marker date="1510543225981" expanded="true" signature="6143:6338" ph="SELECT ra.at... ct_bbtc_report_attachment" />
<marker date="1504679554013" expanded="true" signature="4497:4817" ph="SELECT FROM sys_role" /> <marker date="1510543225981" expanded="true" signature="6390:7304" ph="INSERT INTO ct_bbtc_report... " />
<marker date="1504679554013" expanded="true" signature="4870:5590" ph="INSERT INTO sys_role... " /> <marker date="1510543225981" expanded="true" signature="7366:7706" ph="INSERT INTO ct_bbtc_report_attachment... " />
<marker date="1504679554013" expanded="true" signature="5643:6049" ph="UPDATE sys_r... " /> <marker date="1510543225981" expanded="true" signature="7753:8418" ph="UPDATE ct_bb... " />
<marker date="1504679554013" expanded="true" signature="6110:6157" ph="DELETE FROM " /> <marker date="1510543225981" expanded="true" signature="8479:8569" ph="UPDATE ct_bb... " />
<marker date="1504679554013" expanded="true" signature="6538:6587" ph="DELETE FROM " /> <marker date="1510543225981" expanded="true" signature="8660:11593" ph="SELECT su.id... ct_bbtc_sys_user" />
<marker date="1504679554013" expanded="true" signature="6970:7056" ph="UPDATE sys_r... " /> <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> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="LoginController.java" pinned="false" current-in-tab="false"> <file leaf-file-name="ReportToPdfController.java" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/sys/web/LoginController.java"> <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="5075"> <state relative-caret-position="264">
<caret line="246" column="17" lean-forward="false" selection-start-line="246" selection-start-column="17" selection-end-line="246" selection-end-column="17" /> <caret line="8" column="0" lean-forward="false" selection-start-line="8" selection-start-column="0" selection-end-line="8" selection-end-column="0" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="ejweb.properties" pinned="false" current-in-tab="false"> <file leaf-file-name="pom.xml" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/resources/ejweb.properties"> <entry file="file://$PROJECT_DIR$/pom.xml">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="100"> <state relative-caret-position="-20010">
<caret line="4" column="29" lean-forward="false" selection-start-line="4" selection-start-column="29" selection-end-line="4" selection-end-column="29" /> <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 /> <folding />
</state> </state>
</provider> </provider>
...@@ -222,6 +246,13 @@ ...@@ -222,6 +246,13 @@
<detection-done>true</detection-done> <detection-done>true</detection-done>
<sorting>DEFINITION_ORDER</sorting> <sorting>DEFINITION_ORDER</sorting>
</component> </component>
<component name="LogFilters">
<option name="FILTER_ERRORS" value="false" />
<option name="FILTER_WARNINGS" value="false" />
<option name="FILTER_INFO" value="true" />
<option name="FILTER_DEBUG" value="true" />
<option name="CUSTOM_FILTER" />
</component>
<component name="MavenImportPreferences"> <component name="MavenImportPreferences">
<option name="generalSettings"> <option name="generalSettings">
<MavenGeneralSettings> <MavenGeneralSettings>
...@@ -274,238 +305,140 @@ ...@@ -274,238 +305,140 @@
</navigator> </navigator>
<panes> <panes>
<pane id="Scratches" /> <pane id="Scratches" />
<pane id="Scope" />
<pane id="PackagesPane" />
<pane id="AndroidView" />
<pane id="ProjectPane"> <pane id="ProjectPane">
<subPane> <subPane>
<PATH> <expand>
<PATH_ELEMENT> <path>
<option name="myItemId" value="report-sunac" /> <item name="sunac_report" type="b2602c69:ProjectViewProjectNode" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> <item name="sunac_report" type="462c0819:PsiDirectoryNode" />
</PATH_ELEMENT> </path>
<PATH_ELEMENT> <path>
<option name="myItemId" value="report-sunac" /> <item name="sunac_report" type="b2602c69:ProjectViewProjectNode" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> <item name="sunac_report" type="462c0819:PsiDirectoryNode" />
</PATH_ELEMENT> <item name="src" type="462c0819:PsiDirectoryNode" />
</PATH> </path>
<PATH> <path>
<PATH_ELEMENT> <item name="sunac_report" type="b2602c69:ProjectViewProjectNode" />
<option name="myItemId" value="report-sunac" /> <item name="sunac_report" type="462c0819:PsiDirectoryNode" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> <item name="src" type="462c0819:PsiDirectoryNode" />
</PATH_ELEMENT> <item name="main" type="462c0819:PsiDirectoryNode" />
<PATH_ELEMENT> </path>
<option name="myItemId" value="report-sunac" /> <path>
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> <item name="sunac_report" type="b2602c69:ProjectViewProjectNode" />
</PATH_ELEMENT> <item name="sunac_report" type="462c0819:PsiDirectoryNode" />
<PATH_ELEMENT> <item name="src" type="462c0819:PsiDirectoryNode" />
<option name="myItemId" value="src" /> <item name="main" type="462c0819:PsiDirectoryNode" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> <item name="java" type="462c0819:PsiDirectoryNode" />
</PATH_ELEMENT> </path>
<PATH_ELEMENT> <path>
<option name="myItemId" value="main" /> <item name="sunac_report" type="b2602c69:ProjectViewProjectNode" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> <item name="sunac_report" type="462c0819:PsiDirectoryNode" />
</PATH_ELEMENT> <item name="src" type="462c0819:PsiDirectoryNode" />
</PATH> <item name="main" type="462c0819:PsiDirectoryNode" />
<PATH> <item name="java" type="462c0819:PsiDirectoryNode" />
<PATH_ELEMENT> <item name="com" type="462c0819:PsiDirectoryNode" />
<option name="myItemId" value="report-sunac" /> </path>
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> <path>
</PATH_ELEMENT> <item name="sunac_report" type="b2602c69:ProjectViewProjectNode" />
<PATH_ELEMENT> <item name="sunac_report" type="462c0819:PsiDirectoryNode" />
<option name="myItemId" value="report-sunac" /> <item name="src" type="462c0819:PsiDirectoryNode" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> <item name="main" type="462c0819:PsiDirectoryNode" />
</PATH_ELEMENT> <item name="java" type="462c0819:PsiDirectoryNode" />
<PATH_ELEMENT> <item name="com" type="462c0819:PsiDirectoryNode" />
<option name="myItemId" value="src" /> <item name="ejweb" type="462c0819:PsiDirectoryNode" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </path>
</PATH_ELEMENT> <path>
<PATH_ELEMENT> <item name="sunac_report" type="b2602c69:ProjectViewProjectNode" />
<option name="myItemId" value="main" /> <item name="sunac_report" type="462c0819:PsiDirectoryNode" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> <item name="src" type="462c0819:PsiDirectoryNode" />
</PATH_ELEMENT> <item name="main" type="462c0819:PsiDirectoryNode" />
<PATH_ELEMENT> <item name="java" type="462c0819:PsiDirectoryNode" />
<option name="myItemId" value="java" /> <item name="com" type="462c0819:PsiDirectoryNode" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> <item name="ejweb" type="462c0819:PsiDirectoryNode" />
</PATH_ELEMENT> <item name="modules" type="462c0819:PsiDirectoryNode" />
</PATH> </path>
<PATH> <path>
<PATH_ELEMENT> <item name="sunac_report" type="b2602c69:ProjectViewProjectNode" />
<option name="myItemId" value="report-sunac" /> <item name="sunac_report" type="462c0819:PsiDirectoryNode" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> <item name="src" type="462c0819:PsiDirectoryNode" />
</PATH_ELEMENT> <item name="main" type="462c0819:PsiDirectoryNode" />
<PATH_ELEMENT> <item name="java" type="462c0819:PsiDirectoryNode" />
<option name="myItemId" value="report-sunac" /> <item name="com" type="462c0819:PsiDirectoryNode" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> <item name="ejweb" type="462c0819:PsiDirectoryNode" />
</PATH_ELEMENT> <item name="modules" type="462c0819:PsiDirectoryNode" />
<PATH_ELEMENT> <item name="workbench" type="462c0819:PsiDirectoryNode" />
<option name="myItemId" value="src" /> </path>
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> <path>
</PATH_ELEMENT> <item name="sunac_report" type="b2602c69:ProjectViewProjectNode" />
<PATH_ELEMENT> <item name="sunac_report" type="462c0819:PsiDirectoryNode" />
<option name="myItemId" value="main" /> <item name="src" type="462c0819:PsiDirectoryNode" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> <item name="main" type="462c0819:PsiDirectoryNode" />
</PATH_ELEMENT> <item name="java" type="462c0819:PsiDirectoryNode" />
<PATH_ELEMENT> <item name="com" type="462c0819:PsiDirectoryNode" />
<option name="myItemId" value="java" /> <item name="ejweb" type="462c0819:PsiDirectoryNode" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> <item name="modules" type="462c0819:PsiDirectoryNode" />
</PATH_ELEMENT> <item name="workbench" type="462c0819:PsiDirectoryNode" />
<PATH_ELEMENT> <item name="service" type="462c0819:PsiDirectoryNode" />
<option name="myItemId" value="com" /> </path>
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> <path>
</PATH_ELEMENT> <item name="sunac_report" type="b2602c69:ProjectViewProjectNode" />
<PATH_ELEMENT> <item name="sunac_report" type="462c0819:PsiDirectoryNode" />
<option name="myItemId" value="ejweb" /> <item name="src" type="462c0819:PsiDirectoryNode" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> <item name="main" type="462c0819:PsiDirectoryNode" />
</PATH_ELEMENT> <item name="java" type="462c0819:PsiDirectoryNode" />
<PATH_ELEMENT> <item name="com" type="462c0819:PsiDirectoryNode" />
<option name="myItemId" value="modules" /> <item name="ejweb" type="462c0819:PsiDirectoryNode" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> <item name="modules" type="462c0819:PsiDirectoryNode" />
</PATH_ELEMENT> <item name="workbench" type="462c0819:PsiDirectoryNode" />
</PATH> <item name="web" type="462c0819:PsiDirectoryNode" />
<PATH> </path>
<PATH_ELEMENT> <path>
<option name="myItemId" value="report-sunac" /> <item name="sunac_report" type="b2602c69:ProjectViewProjectNode" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> <item name="sunac_report" type="462c0819:PsiDirectoryNode" />
</PATH_ELEMENT> <item name="src" type="462c0819:PsiDirectoryNode" />
<PATH_ELEMENT> <item name="main" type="462c0819:PsiDirectoryNode" />
<option name="myItemId" value="report-sunac" /> <item name="resources" type="462c0819:PsiDirectoryNode" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </path>
</PATH_ELEMENT> <path>
<PATH_ELEMENT> <item name="sunac_report" type="b2602c69:ProjectViewProjectNode" />
<option name="myItemId" value="src" /> <item name="sunac_report" type="462c0819:PsiDirectoryNode" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> <item name="src" type="462c0819:PsiDirectoryNode" />
</PATH_ELEMENT> <item name="main" type="462c0819:PsiDirectoryNode" />
<PATH_ELEMENT> <item name="resources" type="462c0819:PsiDirectoryNode" />
<option name="myItemId" value="main" /> <item name="mappings" type="462c0819:PsiDirectoryNode" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </path>
</PATH_ELEMENT> <path>
<PATH_ELEMENT> <item name="sunac_report" type="b2602c69:ProjectViewProjectNode" />
<option name="myItemId" value="java" /> <item name="sunac_report" type="462c0819:PsiDirectoryNode" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> <item name="src" type="462c0819:PsiDirectoryNode" />
</PATH_ELEMENT> <item name="main" type="462c0819:PsiDirectoryNode" />
<PATH_ELEMENT> <item name="resources" type="462c0819:PsiDirectoryNode" />
<option name="myItemId" value="com" /> <item name="mappings" type="462c0819:PsiDirectoryNode" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> <item name="modules" type="462c0819:PsiDirectoryNode" />
</PATH_ELEMENT> </path>
<PATH_ELEMENT> <path>
<option name="myItemId" value="ejweb" /> <item name="sunac_report" type="b2602c69:ProjectViewProjectNode" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> <item name="sunac_report" type="462c0819:PsiDirectoryNode" />
</PATH_ELEMENT> <item name="src" type="462c0819:PsiDirectoryNode" />
<PATH_ELEMENT> <item name="main" type="462c0819:PsiDirectoryNode" />
<option name="myItemId" value="modules" /> <item name="resources" type="462c0819:PsiDirectoryNode" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> <item name="mappings" type="462c0819:PsiDirectoryNode" />
</PATH_ELEMENT> <item name="modules" type="462c0819:PsiDirectoryNode" />
<PATH_ELEMENT> <item name="report" type="462c0819:PsiDirectoryNode" />
<option name="myItemId" value="sys" /> </path>
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </expand>
</PATH_ELEMENT> <select />
<PATH_ELEMENT>
<option name="myItemId" value="web" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="report-sunac" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="report-sunac" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="src" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="main" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="java" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="com" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="ejweb" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="modules" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="sys" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="report-sunac" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="report-sunac" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="src" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="main" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="java" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="com" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="ejweb" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="report-sunac" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="report-sunac" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="src" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="main" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="java" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="com" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
</subPane> </subPane>
</pane> </pane>
<pane id="PackagesPane" />
<pane id="Scope" />
</panes> </panes>
</component> </component>
<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="project.propVCSSupport.Mappings" /> <property name="settings.editor.selected.configurable" value="MavenSettings" />
<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" />
...@@ -558,23 +491,188 @@ ...@@ -558,23 +491,188 @@
</option> </option>
</component> </component>
<component name="RunManager" selected="Tomcat Server.Tomcat 7.0"> <component name="RunManager" selected="Tomcat Server.Tomcat 7.0">
<configuration default="true" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" ALTERNATIVE_JRE_ENABLED="false"> <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">
<deployment /> <option name="OPEN_IN_BROWSER_URL" value="http://localhost:8080/admin/login" />
<server-settings /> <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" enabled="true" />
<predefined_log_file id="Tomcat Catalina" enabled="true" /> <predefined_log_file id="Tomcat Catalina" enabled="true" />
<predefined_log_file id="Tomcat Manager" enabled="false" /> <predefined_log_file id="Tomcat Manager" enabled="false" />
<predefined_log_file id="Tomcat Host Manager" enabled="false" /> <predefined_log_file id="Tomcat Host Manager" enabled="false" />
<predefined_log_file id="Tomcat Localhost Access" enabled="false" /> <predefined_log_file id="Tomcat Localhost Access" enabled="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" />
<method /> <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">
<option name="HTML_USED" value="false" />
<option name="WIDTH" value="400" />
<option name="HEIGHT" value="300" />
<option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
<module />
</configuration>
<configuration default="true" type="Application" factoryName="Application">
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
<option name="MAIN_CLASS_NAME" />
<option name="VM_PARAMETERS" />
<option name="PROGRAM_PARAMETERS" />
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" />
<option name="ENABLE_SWING_INSPECTOR" value="false" />
<option name="ENV_VARIABLES" />
<option name="PASS_PARENT_ENVS" value="true" />
<module name="" />
<envs />
</configuration>
<configuration default="true" type="GrailsRunConfigurationType" factoryName="Grails">
<setting name="vmparams" value="" />
<setting name="cmdLine" value="run-app" />
<setting name="passParentEnv" value="true" />
<setting name="launchBrowser" value="true" />
<setting name="launchBrowserUrl" value="" />
<setting name="depsClasspath" value="false" />
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
</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">
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
<module name="" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" />
<option name="PACKAGE_NAME" />
<option name="MAIN_CLASS_NAME" />
<option name="METHOD_NAME" />
<option name="TEST_OBJECT" value="class" />
<option name="VM_PARAMETERS" value="-ea" />
<option name="PARAMETERS" />
<option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
<option name="ENV_VARIABLES" />
<option name="PASS_PARENT_ENVS" value="true" />
<option name="TEST_SEARCH_SCOPE">
<value defaultName="singleModule" />
</option>
<envs />
<patterns />
</configuration>
<configuration default="true" type="JetRunConfigurationType" factoryName="Kotlin">
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
<option name="MAIN_CLASS_NAME" />
<option name="VM_PARAMETERS" />
<option name="PROGRAM_PARAMETERS" />
<option name="WORKING_DIRECTORY" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" />
<option name="PASS_PARENT_ENVS" value="true" />
<module name="it-faq-manage" />
<envs />
</configuration> </configuration>
<configuration default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin"> <configuration default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
<module name="" /> <module name="" />
<option name="VM_PARAMETERS" value="-Xmx512m -Xms256m -XX:MaxPermSize=250m -ea" /> <option name="VM_PARAMETERS" value="-Xmx512m -Xms256m -XX:MaxPermSize=250m -ea" />
<option name="PROGRAM_PARAMETERS" /> <option name="PROGRAM_PARAMETERS" />
<predefined_log_file id="idea.log" enabled="true" /> <predefined_log_file id="idea.log" enabled="true" />
<method /> </configuration>
<configuration default="true" type="Remote" factoryName="Remote">
<option name="USE_SOCKET_TRANSPORT" value="true" />
<option name="SERVER_MODE" value="false" />
<option name="SHMEM_ADDRESS" value="javadebug" />
<option name="HOST" value="localhost" />
<option name="PORT" value="5005" />
</configuration>
<configuration default="true" type="TestNG" factoryName="TestNG">
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
<module name="" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" />
<option name="SUITE_NAME" />
<option name="PACKAGE_NAME" />
<option name="MAIN_CLASS_NAME" />
<option name="METHOD_NAME" />
<option name="GROUP_NAME" />
<option name="TEST_OBJECT" value="CLASS" />
<option name="VM_PARAMETERS" value="-ea" />
<option name="PARAMETERS" />
<option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
<option name="OUTPUT_DIRECTORY" />
<option name="ANNOTATION_TYPE" />
<option name="ENV_VARIABLES" />
<option name="PASS_PARENT_ENVS" value="true" />
<option name="TEST_SEARCH_SCOPE">
<value defaultName="singleModule" />
</option>
<option name="USE_DEFAULT_REPORTERS" value="false" />
<option name="PROPERTIES_FILE" />
<envs />
<properties />
<listeners />
</configuration> </configuration>
<configuration default="true" type="AndroidRunConfigurationType" factoryName="Android App"> <configuration default="true" type="AndroidRunConfigurationType" factoryName="Android App">
<module name="" /> <module name="" />
...@@ -604,6 +702,25 @@ ...@@ -604,6 +702,25 @@
<option name="ACTIVITY_CLASS" value="" /> <option name="ACTIVITY_CLASS" value="" />
<method /> <method />
</configuration> </configuration>
<configuration default="true" type="AndroidRunConfigurationType" factoryName="Android Application">
<module name="" />
<option name="DEPLOY" value="true" />
<option name="ARTIFACT_NAME" value="" />
<option name="PM_INSTALL_OPTIONS" value="" />
<option name="ACTIVITY_EXTRA_FLAGS" value="" />
<option name="MODE" value="default_activity" />
<option name="TARGET_SELECTION_MODE" value="SHOW_DIALOG" />
<option name="PREFERRED_AVD" value="" />
<option name="CLEAR_LOGCAT" value="false" />
<option name="SHOW_LOGCAT_AUTOMATICALLY" value="true" />
<option name="SKIP_NOOP_APK_INSTALLATIONS" value="true" />
<option name="FORCE_STOP_RUNNING_APP" value="true" />
<option name="USE_LAST_SELECTED_DEVICE" value="false" />
<option name="PREFERRED_AVD" value="" />
<option name="DEEP_LINK" value="" />
<option name="ACTIVITY_CLASS" value="" />
<method />
</configuration>
<configuration default="true" type="AndroidTestRunConfigurationType" factoryName="Android Tests"> <configuration default="true" type="AndroidTestRunConfigurationType" factoryName="Android Tests">
<module name="" /> <module name="" />
<option name="TESTING_TYPE" value="0" /> <option name="TESTING_TYPE" value="0" />
...@@ -631,29 +748,6 @@ ...@@ -631,29 +748,6 @@
</Profilers> </Profilers>
<method /> <method />
</configuration> </configuration>
<configuration default="true" type="Applet" factoryName="Applet">
<option name="HTML_USED" value="false" />
<option name="WIDTH" value="400" />
<option name="HEIGHT" value="300" />
<option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
<module />
<method />
</configuration>
<configuration default="true" type="Application" factoryName="Application">
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
<option name="MAIN_CLASS_NAME" />
<option name="VM_PARAMETERS" />
<option name="PROGRAM_PARAMETERS" />
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" />
<option name="ENABLE_SWING_INSPECTOR" value="false" />
<option name="ENV_VARIABLES" />
<option name="PASS_PARENT_ENVS" value="true" />
<module name="" />
<envs />
<method />
</configuration>
<configuration default="true" type="ArquillianJUnit" factoryName="" nameIsGenerated="true"> <configuration default="true" type="ArquillianJUnit" factoryName="" nameIsGenerated="true">
<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="" />
...@@ -796,39 +890,8 @@ ...@@ -796,39 +890,8 @@
<option name="taskNames"> <option name="taskNames">
<list /> <list />
</option> </option>
<option name="vmOptions" /> <option name="vmOptions" />
</ExternalSystemSettings> </ExternalSystemSettings>
<method />
</configuration>
<configuration default="true" type="GrailsRunConfigurationType" factoryName="Grails">
<setting name="vmparams" value="" />
<setting name="cmdLine" value="run-app" />
<setting name="passParentEnv" value="true" />
<setting name="launchBrowser" value="true" />
<setting name="launchBrowserUrl" value="" />
<setting name="depsClasspath" value="false" />
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
<method />
</configuration>
<configuration default="true" type="JUnit" factoryName="JUnit">
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
<module name="" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" />
<option name="PACKAGE_NAME" />
<option name="MAIN_CLASS_NAME" />
<option name="METHOD_NAME" />
<option name="TEST_OBJECT" value="class" />
<option name="VM_PARAMETERS" value="-ea" />
<option name="PARAMETERS" />
<option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
<option name="ENV_VARIABLES" />
<option name="PASS_PARENT_ENVS" value="true" />
<option name="TEST_SEARCH_SCOPE">
<value defaultName="singleModule" />
</option>
<envs />
<patterns />
<method /> <method />
</configuration> </configuration>
<configuration default="true" type="JarApplication" factoryName="JAR Application"> <configuration default="true" type="JarApplication" factoryName="JAR Application">
...@@ -868,19 +931,6 @@ ...@@ -868,19 +931,6 @@
<configuration default="true" type="JavascriptDebugType" factoryName="JavaScript Debug"> <configuration default="true" type="JavascriptDebugType" factoryName="JavaScript Debug">
<method /> <method />
</configuration> </configuration>
<configuration default="true" type="JetRunConfigurationType" factoryName="Kotlin">
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
<option name="MAIN_CLASS_NAME" />
<option name="VM_PARAMETERS" />
<option name="PROGRAM_PARAMETERS" />
<option name="WORKING_DIRECTORY" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" />
<option name="PASS_PARENT_ENVS" value="true" />
<module name="it-faq-manage" />
<envs />
<method />
</configuration>
<configuration default="true" type="KotlinStandaloneScriptRunConfigurationType" factoryName="Kotlin script"> <configuration default="true" type="KotlinStandaloneScriptRunConfigurationType" factoryName="Kotlin script">
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" /> <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
<option name="filePath" /> <option name="filePath" />
...@@ -915,55 +965,21 @@ ...@@ -915,55 +965,21 @@
</MavenSettings> </MavenSettings>
<method /> <method />
</configuration> </configuration>
<configuration default="true" type="Remote" factoryName="Remote">
<option name="USE_SOCKET_TRANSPORT" value="true" />
<option name="SERVER_MODE" value="false" />
<option name="SHMEM_ADDRESS" value="javadebug" />
<option name="HOST" value="localhost" />
<option name="PORT" value="5005" />
<method />
</configuration>
<configuration default="true" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot"> <configuration default="true" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
<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="" />
<envs /> <envs />
<method /> <method />
</configuration> </configuration>
<configuration default="true" type="TestNG" factoryName="TestNG"> <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" /> <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
<module name="" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" />
<option name="SUITE_NAME" />
<option name="PACKAGE_NAME" />
<option name="MAIN_CLASS_NAME" />
<option name="METHOD_NAME" />
<option name="GROUP_NAME" />
<option name="TEST_OBJECT" value="CLASS" />
<option name="VM_PARAMETERS" value="-ea" />
<option name="PARAMETERS" />
<option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
<option name="OUTPUT_DIRECTORY" />
<option name="ANNOTATION_TYPE" />
<option name="ENV_VARIABLES" />
<option name="PASS_PARENT_ENVS" value="true" />
<option name="TEST_SEARCH_SCOPE">
<value defaultName="singleModule" />
</option>
<option name="USE_DEFAULT_REPORTERS" value="false" />
<option name="PROPERTIES_FILE" />
<envs />
<properties />
<listeners />
<method />
</configuration>
<configuration default="true" type="js.build_tools.gulp" factoryName="Gulp.js">
<node-interpreter>project</node-interpreter>
<node-options />
<gulpfile />
<tasks />
<arguments />
<envs />
<method /> <method />
</configuration> </configuration>
<configuration default="true" type="js.build_tools.npm" factoryName="npm"> <configuration default="true" type="js.build_tools.npm" factoryName="npm">
...@@ -979,101 +995,6 @@ ...@@ -979,101 +995,6 @@
<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="false" 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>
<list size="1">
<item index="0" class="java.lang.String" itemvalue="Tomcat Server.Tomcat 7.0" />
</list>
<configuration default="true" type="AndroidRunConfigurationType" factoryName="Android Application">
<module name="" />
<option name="DEPLOY" value="true" />
<option name="ARTIFACT_NAME" value="" />
<option name="PM_INSTALL_OPTIONS" value="" />
<option name="ACTIVITY_EXTRA_FLAGS" value="" />
<option name="MODE" value="default_activity" />
<option name="TARGET_SELECTION_MODE" value="SHOW_DIALOG" />
<option name="PREFERRED_AVD" value="" />
<option name="CLEAR_LOGCAT" value="false" />
<option name="SHOW_LOGCAT_AUTOMATICALLY" value="true" />
<option name="SKIP_NOOP_APK_INSTALLATIONS" value="true" />
<option name="FORCE_STOP_RUNNING_APP" value="true" />
<option name="USE_LAST_SELECTED_DEVICE" value="false" />
<option name="PREFERRED_AVD" value="" />
<option name="DEEP_LINK" value="" />
<option name="ACTIVITY_CLASS" value="" />
<method />
</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" />
...@@ -1583,7 +1504,7 @@ ...@@ -1583,7 +1504,7 @@
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="351208000" /> <option name="totallyTimeSpent" value="351508000" />
</component> </component>
<component name="TodoView"> <component name="TodoView">
<todo-panel id="selected-file"> <todo-panel id="selected-file">
...@@ -1595,16 +1516,45 @@ ...@@ -1595,16 +1516,45 @@
</todo-panel> </todo-panel>
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="-8" y="-8" width="1320" height="784" extended-state="6" /> <frame x="-11" y="-11" width="1942" height="1042" extended-state="6" />
<editor active="true" />
<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="3" 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="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="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="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.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="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="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="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.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="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="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" />
<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="2" 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="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="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="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="7" 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="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="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="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="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="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="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" />
...@@ -1617,6 +1567,7 @@ ...@@ -1617,6 +1567,7 @@
<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="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="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="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="false" weight="0.29252437" 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="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="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="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" />
...@@ -1627,11 +1578,6 @@ ...@@ -1627,11 +1578,6 @@
<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="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" /> <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="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="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="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" />
</layout> </layout>
<layout-to-restore> <layout-to-restore>
<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="3" side_tool="false" content_ui="tabs" />
...@@ -1665,8 +1611,31 @@ ...@@ -1665,8 +1611,31 @@
<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="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> </layout-to-restore>
</component> </component>
<component name="TypeScriptGeneratedFilesManager"> <component name="Vcs.Log.Tabs.Properties">
<option name="processedProjectFiles" value="true" /> <option name="TAB_STATES">
<map>
<entry key="MAIN">
<value>
<State>
<option name="RECENTLY_FILTERED_USER_GROUPS">
<collection />
</option>
<option name="RECENTLY_FILTERED_BRANCH_GROUPS">
<collection />
</option>
<option name="COLUMN_ORDER">
<list>
<option value="0" />
<option value="1" />
<option value="2" />
<option value="3" />
</list>
</option>
</State>
</value>
</entry>
</map>
</option>
</component> </component>
<component name="Vcs.Log.UiProperties"> <component name="Vcs.Log.UiProperties">
<option name="RECENTLY_FILTERED_USER_GROUPS"> <option name="RECENTLY_FILTERED_USER_GROUPS">
...@@ -1697,7 +1666,6 @@ ...@@ -1697,7 +1666,6 @@
<MESSAGE value="修改提问内容的placeholder&#10;" /> <MESSAGE value="修改提问内容的placeholder&#10;" />
<MESSAGE value="将调用sunac-core改成用ldap" /> <MESSAGE value="将调用sunac-core改成用ldap" />
<MESSAGE value="去掉退出按钮" /> <MESSAGE value="去掉退出按钮" />
<MESSAGE value="放开root的退出" />
<MESSAGE value="屏蔽掉所有用户的个人信息修改" /> <MESSAGE value="屏蔽掉所有用户的个人信息修改" />
<MESSAGE value="web端拦截用户区域" /> <MESSAGE value="web端拦截用户区域" />
<MESSAGE value="屏蔽掉提问上传的空文件" /> <MESSAGE value="屏蔽掉提问上传的空文件" />
...@@ -1709,7 +1677,8 @@ ...@@ -1709,7 +1677,8 @@
<MESSAGE value="登录失效跳转问题" /> <MESSAGE value="登录失效跳转问题" />
<MESSAGE value="限制图片上传格式" /> <MESSAGE value="限制图片上传格式" />
<MESSAGE value="限制上传图片类型" /> <MESSAGE value="限制上传图片类型" />
<option name="LAST_COMMIT_MESSAGE" value="限制上传图片类型" /> <MESSAGE value="放开root的退出" />
<option name="LAST_COMMIT_MESSAGE" value="放开root的退出" />
</component> </component>
<component name="XDebuggerManager"> <component name="XDebuggerManager">
<breakpoint-manager> <breakpoint-manager>
...@@ -1733,7 +1702,6 @@ ...@@ -1733,7 +1702,6 @@
<option name="FILTER_TARGETS" value="false" /> <option name="FILTER_TARGETS" value="false" />
</component> </component>
<component name="editorHistoryManager"> <component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/ask/entity/AskCommentEntity.java" />
<entry file="jar://$MAVEN_REPOSITORY$/javax/servlet/servlet-api/2.5/servlet-api-2.5-sources.jar!/javax/servlet/http/HttpServletRequest.java"> <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"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="185"> <state relative-caret-position="185">
...@@ -1855,12 +1823,7 @@ ...@@ -1855,12 +1823,7 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="720"> <state relative-caret-position="720">
<caret line="24" column="46" lean-forward="false" selection-start-line="24" selection-start-column="46" selection-end-line="24" selection-end-column="46" /> <caret line="24" column="46" lean-forward="false" selection-start-line="24" selection-start-column="46" selection-end-line="24" selection-end-column="46" />
<folding> <folding />
<marker date="1501554041450" expanded="true" signature="2245:2375" ph="..." />
<marker date="1501554041450" expanded="true" signature="4071:4083" ph="..." />
<marker date="1501554041450" expanded="true" signature="4231:4243" ph="..." />
<marker date="1501554041450" expanded="true" signature="4391:4403" ph="..." />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -2113,14 +2076,6 @@ ...@@ -2113,14 +2076,6 @@
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/resources/mappings/modules/ask/AskDao.xml" /> <entry file="file://$PROJECT_DIR$/src/main/resources/mappings/modules/ask/AskDao.xml" />
<entry file="file://$PROJECT_DIR$/pom.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="150">
<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/java/com/ejweb/conf/GConstants.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/conf/GConstants.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="233"> <state relative-caret-position="233">
...@@ -2147,20 +2102,6 @@ ...@@ -2147,20 +2102,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="4125"> <state relative-caret-position="4125">
<caret line="165" column="44" lean-forward="false" selection-start-line="165" selection-start-column="43" selection-end-line="165" selection-end-column="44" /> <caret line="165" column="44" lean-forward="false" selection-start-line="165" selection-start-column="43" selection-end-line="165" selection-end-column="44" />
<folding>
<marker date="1504679553917" expanded="true" signature="1400:1543" ph="SELECT FROM ${db.table.prefix}" />
<marker date="1504679553917" expanded="true" signature="1618:1893" ph="SELECT FROM ${db.table.prefix}" />
<marker date="1504679553917" expanded="true" signature="1979:2165" ph="SELECT FROM ${db.table.prefix}" />
<marker date="1504679553917" expanded="true" signature="2247:2468" ph="SELECT FROM ${db.table.prefix}" />
<marker date="1504679553917" expanded="true" signature="2569:2782" ph="SELECT FROM ${db.table.prefix}" />
<marker date="1504679553917" expanded="true" signature="2882:3052" ph="SELECT FROM ${db.table.prefix}" />
<marker date="1504679553917" expanded="true" signature="3126:3320" ph="SELECT FROM ${db.table.prefix}" />
<marker date="1504679553917" expanded="true" signature="3368:4549" ph="INSERT INTO ${db.table.prefix}sys_office... " />
<marker date="1504679553917" expanded="true" signature="4602:5315" ph="UPDATE ${db.... " />
<marker date="1504679553917" expanded="true" signature="5377:5500" ph="UPDATE ${db.... " />
<marker date="1504679553917" expanded="true" signature="5553:5879" ph="UPDATE ${db.... " />
<marker date="1504679553917" expanded="true" signature="5560:5879" ph="UPDATE sys_o... " />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -2168,7 +2109,6 @@ ...@@ -2168,7 +2109,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3425"> <state relative-caret-position="3425">
<caret line="137" column="24" lean-forward="false" selection-start-line="137" selection-start-column="24" selection-end-line="137" selection-end-column="24" /> <caret line="137" column="24" lean-forward="false" selection-start-line="137" selection-start-column="24" selection-end-line="137" selection-end-column="24" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -2176,12 +2116,6 @@ ...@@ -2176,12 +2116,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="125"> <state relative-caret-position="125">
<caret line="5" column="8" lean-forward="false" selection-start-line="5" selection-start-column="7" selection-end-line="5" selection-end-column="8" /> <caret line="5" column="8" lean-forward="false" selection-start-line="5" selection-start-column="7" selection-end-line="5" selection-end-column="8" />
<folding>
<marker date="1504679554046" expanded="true" signature="259:463" ph="SELECT a.*, sys_log" />
<marker date="1504679554046" expanded="true" signature="259:1658" ph="SELECT a.*, ${db.table.prefix}" />
<marker date="1504679554046" expanded="true" signature="1711:2284" ph="INSERT INTO ${db.table.prefix}sys_log... " />
<marker date="1504679554046" expanded="true" signature="1723:2284" ph="INSERT INTO sys_log... " />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -2189,7 +2123,6 @@ ...@@ -2189,7 +2123,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="250"> <state relative-caret-position="250">
<caret line="10" column="4" lean-forward="false" selection-start-line="10" selection-start-column="4" selection-end-line="10" selection-end-column="4" /> <caret line="10" column="4" lean-forward="false" selection-start-line="10" selection-start-column="4" selection-end-line="10" selection-end-column="4" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -2226,34 +2159,14 @@ ...@@ -2226,34 +2159,14 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="84"> <state relative-caret-position="84">
<caret line="20" column="4" lean-forward="true" selection-start-line="20" selection-start-column="4" selection-end-line="20" selection-end-column="4" /> <caret line="20" column="4" lean-forward="true" selection-start-line="20" selection-start-column="4" selection-end-line="20" selection-end-column="4" />
<folding>
<marker date="1504679553821" expanded="true" signature="722:859" ph="SELECT FROM ${dbprefix}" />
<marker date="1504679553821" expanded="true" signature="932:1206" ph="SELECT FROM ${dbprefix}" />
<marker date="1504679553821" expanded="true" signature="1282:1462" ph="SELECT FROM ${dbprefix}" />
<marker date="1504679553821" expanded="true" signature="1546:1764" ph="SELECT a.id,... ${dbprefix}" />
<marker date="1504679553821" expanded="true" signature="1817:2475" ph="INSERT INTO ${dbprefix}sys_area... " />
<marker date="1504679553821" expanded="true" signature="2528:2883" ph="UPDATE ${dbp... " />
<marker date="1504679553821" expanded="true" signature="2945:3066" ph="UPDATE ${dbp... " />
<marker date="1504679553821" expanded="true" signature="3119:3443" ph="UPDATE ${dbp... " />
</folding>
</state>
</provider>
</entry>
<entry file="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis-spring/1.2.3/mybatis-spring-1.2.3-sources.jar!/org/mybatis/spring/MyBatisExceptionTranslator.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="508">
<caret line="75" column="0" lean-forward="false" selection-start-line="75" selection-start-column="0" selection-end-line="75" selection-end-column="0" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis-spring/1.2.3/mybatis-spring-1.2.3-sources.jar!/org/mybatis/spring/MyBatisExceptionTranslator.java" />
<entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/sys/service/SystemService.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/ejweb/modules/sys/service/SystemService.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1200"> <state relative-caret-position="1200">
<caret line="84" column="19" lean-forward="false" selection-start-line="84" selection-start-column="19" selection-end-line="84" selection-end-column="19" /> <caret line="84" column="19" lean-forward="false" selection-start-line="84" selection-start-column="19" selection-end-line="84" selection-end-column="19" />
<folding>
<element signature="e#2303#2304#0" expanded="true" />
<element signature="e#2361#2362#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -2261,7 +2174,6 @@ ...@@ -2261,7 +2174,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="250"> <state relative-caret-position="250">
<caret line="21" column="49" lean-forward="false" selection-start-line="21" selection-start-column="49" selection-end-line="21" selection-end-column="49" /> <caret line="21" column="49" lean-forward="false" selection-start-line="21" selection-start-column="49" selection-end-line="21" selection-end-column="49" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -2269,7 +2181,6 @@ ...@@ -2269,7 +2181,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="275"> <state relative-caret-position="275">
<caret line="27" column="22" lean-forward="false" selection-start-line="27" selection-start-column="22" selection-end-line="27" selection-end-column="22" /> <caret line="27" column="22" lean-forward="false" selection-start-line="27" selection-start-column="22" selection-end-line="27" selection-end-column="22" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -2277,7 +2188,6 @@ ...@@ -2277,7 +2188,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="250"> <state relative-caret-position="250">
<caret line="26" column="32" lean-forward="false" selection-start-line="26" selection-start-column="32" selection-end-line="26" selection-end-column="32" /> <caret line="26" column="32" lean-forward="false" selection-start-line="26" selection-start-column="32" selection-end-line="26" selection-end-column="32" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -2285,22 +2195,6 @@ ...@@ -2285,22 +2195,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2975"> <state relative-caret-position="2975">
<caret line="119" column="57" lean-forward="false" selection-start-line="119" selection-start-column="57" selection-end-line="119" selection-end-column="57" /> <caret line="119" column="57" lean-forward="false" selection-start-line="119" selection-start-column="57" selection-end-line="119" selection-end-column="57" />
<folding>
<marker date="1504679553742" expanded="true" signature="6180:6317" ph="SELECT FROM sys_user" />
<marker date="1504679553742" expanded="true" signature="6436:6753" ph="SELECT FROM sys_user" />
<marker date="1504679553742" expanded="true" signature="9363:9545" ph="SELECT a.id,... sys_user" />
<marker date="1504679553742" expanded="true" signature="9637:9833" ph="SELECT FROM sys_user" />
<marker date="1504679553742" expanded="true" signature="9928:10025" ph="SELECT COUNT... sys_user" />
<marker date="1504679553742" expanded="true" signature="10092:11007" ph="INSERT INTO sys_user... " />
<marker date="1504679553742" expanded="true" signature="11061:11229" ph="INSERT INTO sys_user_profiles... " />
<marker date="1504679553742" expanded="true" signature="11295:11856" ph="UPDATE sys_u... " />
<marker date="1504679553742" expanded="true" signature="11939:11986" ph="DELETE FROM " />
<marker date="1504679553742" expanded="true" signature="12404:12684" ph="UPDATE sys_u... " />
<marker date="1504679553742" expanded="true" signature="12765:12844" ph="UPDATE sys_u... " />
<marker date="1504679553742" expanded="true" signature="12933:13050" ph="UPDATE sys_u... " />
<marker date="1504679553742" expanded="true" signature="13119:13205" ph="UPDATE sys_u... " />
<marker date="1504679553742" expanded="true" signature="13126:13205" ph="UPDATE sys_u... " />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -2316,18 +2210,6 @@ ...@@ -2316,18 +2210,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="350"> <state relative-caret-position="350">
<caret line="22" column="25" lean-forward="true" selection-start-line="22" selection-start-column="25" selection-end-line="22" selection-end-column="25" /> <caret line="22" column="25" lean-forward="true" selection-start-line="22" selection-start-column="25" selection-end-line="22" selection-end-column="25" />
<folding>
<marker date="1504679554013" expanded="true" signature="2094:3060" ph="SELECT , rm.... " />
<marker date="1504679554013" expanded="true" signature="3130:3318" ph="SELECT FROM sys_role" />
<marker date="1504679554013" expanded="true" signature="3390:3582" ph="SELECT FROM sys_role" />
<marker date="1504679554013" expanded="true" signature="3656:4425" ph="SELECT , ro.... " />
<marker date="1504679554013" expanded="true" signature="4497:4817" ph="SELECT FROM sys_role" />
<marker date="1504679554013" expanded="true" signature="4870:5590" ph="INSERT INTO sys_role... " />
<marker date="1504679554013" expanded="true" signature="5643:6049" ph="UPDATE sys_r... " />
<marker date="1504679554013" expanded="true" signature="6110:6157" ph="DELETE FROM " />
<marker date="1504679554013" expanded="true" signature="6538:6587" ph="DELETE FROM " />
<marker date="1504679554013" expanded="true" signature="6970:7056" ph="UPDATE sys_r... " />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -2335,10 +2217,6 @@ ...@@ -2335,10 +2217,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="141"> <state relative-caret-position="141">
<caret line="15" column="2" lean-forward="true" selection-start-line="15" selection-start-column="2" selection-end-line="15" selection-end-column="2" /> <caret line="15" column="2" lean-forward="true" selection-start-line="15" selection-start-column="2" selection-end-line="15" selection-end-column="2" />
<folding>
<element signature="e#762#763#0" expanded="true" />
<element signature="e#836#837#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -2346,7 +2224,6 @@ ...@@ -2346,7 +2224,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="100"> <state relative-caret-position="100">
<caret line="4" column="29" lean-forward="false" selection-start-line="4" selection-start-column="29" selection-end-line="4" selection-end-column="29" /> <caret line="4" column="29" lean-forward="false" selection-start-line="4" selection-start-column="29" selection-end-line="4" selection-end-column="29" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -2358,6 +2235,22 @@ ...@@ -2358,6 +2235,22 @@
</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/java/com/ejweb/modules/report/web/ReportToPdfController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="264">
<caret line="8" column="0" lean-forward="false" selection-start-line="8" selection-start-column="0" selection-end-line="8" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
</component> </component>
<component name="masterDetails"> <component name="masterDetails">
<states> <states>
......
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://C:/Program Files/Java/jdk1.8.0_131/lib/jconsole.jar!/" /> <root url="jar://D:/Java/jdk1.8.0_144/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://C:/Program Files/Java/jdk1.8.0_131/lib/tools.jar!/" /> <root url="jar://D:/Java/jdk1.8.0_144/lib/tools.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />
...@@ -256,5 +256,7 @@ ...@@ -256,5 +256,7 @@
<orderEntry type="library" name="Maven: com.kingdee.eas.cp.eip.sso.ltpa:LTPATokenManager:1.0.0" level="project" /> <orderEntry type="library" name="Maven: com.kingdee.eas.cp.eip.sso.ltpa:LTPATokenManager:1.0.0" level="project" />
<orderEntry type="library" name="Maven: jfree:jfreechart:1.0.13" level="project" /> <orderEntry type="library" name="Maven: jfree:jfreechart:1.0.13" level="project" />
<orderEntry type="library" name="Maven: jfree:jcommon:1.0.16" level="project" /> <orderEntry type="library" name="Maven: jfree:jcommon:1.0.16" level="project" />
<orderEntry type="library" name="Maven: com.itextpdf:itextpdf:5.5.10" level="project" />
<orderEntry type="library" name="Maven: com.itextpdf:itext-asian:5.2.0" level="project" />
</component> </component>
</module> </module>
\ No newline at end of file
src/main/java/com/ejweb/modules/report/web/ReportController.java
...@@ -230,14 +230,13 @@ public class ReportController extends BaseController { ...@@ -230,14 +230,13 @@ public class ReportController extends BaseController {
List<ReportAttachmentEntity> dealAttachmentList = reportService.getAttachmentInfo(dealAttachment); List<ReportAttachmentEntity> dealAttachmentList = reportService.getAttachmentInfo(dealAttachment);
//业务类型 //业务类型
String supplementTypeStr=""; String supplementTypeStr="";
if (StringUtils.isNoneBlank(reportEntity.getSupplementType())) { String[] supplementTypes = {"营销","工程","成本","招采","人力","物业","投诉","行政","财务","商业管理","研发","投资开发"};
String[] supplementTypes = {"营销", "工程", "成本", "招采", "人力", "物业", "投诉", "行政", "财务", "商业管理", "研发", "投资开发"};
String typeNumber[] = reportEntity.getSupplementType().split(","); String typeNumber[] = reportEntity.getSupplementType().split(",");
for (int i = 0; i < typeNumber.length; i++) { for(int i = 0;i < typeNumber.length;i++)
supplementTypeStr += supplementTypes[Integer.valueOf(typeNumber[i]) - 1] + ","; {
} supplementTypeStr += supplementTypes[Integer.valueOf(typeNumber[i])-1]+",";
supplementTypeStr = supplementTypeStr.substring(0, supplementTypeStr.length() - 1);
} }
supplementTypeStr = supplementTypeStr.substring(0,supplementTypeStr.length()-1);
model.addAttribute("page", page); model.addAttribute("page", page);
model.addAttribute("user", userEntity); model.addAttribute("user", userEntity);
model.addAttribute("userName", user.getName()); model.addAttribute("userName", user.getName());
...@@ -420,11 +419,49 @@ public class ReportController extends BaseController { ...@@ -420,11 +419,49 @@ public class ReportController extends BaseController {
//判断登录人的角色 //判断登录人的角色
User user = UserUtils.getUser(); User user = UserUtils.getUser();
if (!reportService.checkRole(user)){ if (!reportService.checkRole(user)){
reportEntity.setExchangeAfterUser(user.getId()); reportEntity.setExchangeAfterUser(user.getId());
} }
Page<ReportEntity> page = reportService.getChooseReportPage(new Page<ReportEntity>(request, response), reportEntity); Page<ReportEntity> page = reportService.getChooseReportPage(new Page<ReportEntity>(request, response), reportEntity);
User userEntity = new User(); User userEntity = new User();
Page<User> userPage = reportService.findUserPage(new Page<User>(1, 10), userEntity); Page<User> userPage = reportService.findUserPage(new Page<User>(1, 10), userEntity);
List<ReportEntity> reportlist = page.getList();
for (ReportEntity report : reportlist){
String typeStr="";
if (StringUtils.isNoneBlank(report.getSupplementType())) {
String[] types = report.getSupplementType().split(",");
for (String value : types) {
if (value.equals("1")) {
value = "营销";
} else if (value.equals("2")) {
value = "工程";
} else if (value.equals("3")) {
value = "成本";
} else if (value.equals("4")) {
value = "招采";
} else if (value.equals("5")) {
value = "人力";
} else if (value.equals("6")) {
value = "物业";
} else if (value.equals("7")) {
value = "投诉";
} else if (value.equals("8")) {
value = "行政";
} else if (value.equals("9")) {
value = "财务";
} else if (value.equals("10")) {
value = "商业管理";
} else if (value.equals("11")) {
value = "研发";
} else if(value.equals("12")) {
value ="投资开发";
}
typeStr =typeStr+value+",";
}
report.setSupplementType(typeStr.substring(0,typeStr.length()-1));
}
}
page.setList(reportlist);
model.addAttribute("page", page); model.addAttribute("page", page);
model.addAttribute("userPage", userPage); model.addAttribute("userPage", userPage);
model.addAttribute("user", userEntity); model.addAttribute("user", userEntity);
......
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