Skip to content

M
manager
Commit 26e95dd4 by manxiaoqiang
Options

sendemail

parent acda0052
Showing with 183 additions and 117 deletions
.idea/workspace.xml
......@@ -3,6 +3,11 @@
<component name="ChangeListManager">
<list default="true" id="e2e217e2-2dd6-4c6f-ad19-b1cba46bc7ad" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/pom.xml" afterPath="$PROJECT_DIR$/pom.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/common/repository/ReminderRepository.java" afterPath="$PROJECT_DIR$/src/main/java/common/repository/ReminderRepository.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/security/interceptor/AuthorizationInterceptor.java" afterPath="$PROJECT_DIR$/src/main/java/security/interceptor/AuthorizationInterceptor.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/tkio/service/impl/SendEmailServiceImpl.java" afterPath="$PROJECT_DIR$/src/main/java/tkio/service/impl/SendEmailServiceImpl.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/tkio/task/SendEmailTask.java" afterPath="$PROJECT_DIR$/src/main/java/tkio/task/SendEmailTask.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/resources/spring/applicationContext-schedule.xml" afterPath="$PROJECT_DIR$/src/main/resources/spring/applicationContext-schedule.xml" />
</list>
<ignored path="$PROJECT_DIR$/target/" />
......@@ -27,64 +32,59 @@
<file leaf-file-name="pom.xml" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pom.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="306">
<caret line="67" column="44" lean-forward="false" selection-start-line="67" selection-start-column="44" selection-end-line="67" selection-end-column="44" />
<state relative-caret-position="1403">
<caret line="61" column="45" lean-forward="false" selection-start-line="61" selection-start-column="45" selection-end-line="61" selection-end-column="45" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="AccountTask.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/task/AccountTask.java">
<file leaf-file-name="SendEmailServiceImpl.java" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/service/impl/SendEmailServiceImpl.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="44" column="19" lean-forward="true" selection-start-line="44" selection-start-column="19" selection-end-line="44" selection-end-column="19" />
<state relative-caret-position="228">
<caret line="31" column="87" lean-forward="false" selection-start-line="31" selection-start-column="87" selection-end-line="31" selection-end-column="87" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="AuthorizationInterceptor.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/security/interceptor/AuthorizationInterceptor.java">
<file leaf-file-name="ReminderRepository.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/common/repository/ReminderRepository.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="87">
<caret line="50" column="0" lean-forward="false" selection-start-line="50" selection-start-column="0" selection-end-line="50" selection-end-column="0" />
<state relative-caret-position="299">
<caret line="20" column="138" lean-forward="false" selection-start-line="20" selection-start-column="138" selection-end-line="20" selection-end-column="138" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="applicationContext-schedule.xml" pinned="false" current-in-tab="true">
<file leaf-file-name="applicationContext-schedule.xml" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-schedule.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="177">
<caret line="24" column="69" lean-forward="false" selection-start-line="24" selection-start-column="69" selection-end-line="24" selection-end-column="69" />
<state relative-caret-position="552">
<caret line="24" column="63" lean-forward="false" selection-start-line="24" selection-start-column="63" selection-end-line="24" selection-end-column="63" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="AccountFlowRestrictServiceImpl.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/service/impl/AccountFlowRestrictServiceImpl.java">
<file leaf-file-name="AuthorizationInterceptor.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/security/interceptor/AuthorizationInterceptor.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="84">
<caret line="114" column="0" lean-forward="false" selection-start-line="114" selection-start-column="0" selection-end-line="114" selection-end-column="0" />
<state relative-caret-position="23">
<caret line="49" column="57" lean-forward="false" selection-start-line="49" selection-start-column="57" selection-end-line="49" selection-end-column="57" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="Account4Web.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/common/model/Account4Web.java">
<file leaf-file-name="SendEmailTask.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/task/SendEmailTask.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="92">
<caret line="14" column="27" lean-forward="false" selection-start-line="14" selection-start-column="19" selection-end-line="14" selection-end-column="27" />
<folding>
<element signature="e#3873#3874#0" expanded="true" />
<element signature="e#3904#3905#0" expanded="true" />
<element signature="e#3952#3953#0" expanded="true" />
<element signature="e#3992#3993#0" expanded="true" />
</folding>
<state relative-caret-position="422">
<caret line="130" column="33" lean-forward="false" selection-start-line="130" selection-start-column="33" selection-end-line="130" selection-end-column="33" />
<folding />
</state>
</provider>
</entry>
......@@ -125,9 +125,7 @@
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/src/main/java/common/repository/UserLogRepository.java" />
<option value="$PROJECT_DIR$/src/main/java/util/UserLogThread.java" />
<option value="$PROJECT_DIR$/src/main/java/security/interceptor/AuthorizationInterceptor.java" />
<option value="$PROJECT_DIR$/src/main/java/track/service/impl/TrackAccountServiceImpl.java" />
<option value="$PROJECT_DIR$/src/main/java/common/controller/UserLogController.java" />
<option value="$PROJECT_DIR$/src/main/java/tkio/task/SyncAppDataTask.java" />
......@@ -165,17 +163,19 @@
<option value="$PROJECT_DIR$/target/classes/spring/applicationContext.xml" />
<option value="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" />
<option value="$PROJECT_DIR$/src/main/java/tkio/service/SendEmailService.java" />
<option value="$PROJECT_DIR$/src/main/java/tkio/service/impl/SendEmailServiceImpl.java" />
<option value="$PROJECT_DIR$/src/main/java/tkio/task/SendEmailTask.java" />
<option value="$PROJECT_DIR$/src/main/java/tkio/service/impl/TkioAccountServiceImpl.java" />
<option value="$PROJECT_DIR$/src/main/java/common/task/SyncAppDataTask.java" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml" />
<option value="$PROJECT_DIR$/src/main/java/common/service/UserService.java" />
<option value="$PROJECT_DIR$/src/main/java/common/service/impl/UserServiceImpl.java" />
<option value="$PROJECT_DIR$/src/main/java/common/model/Account4Web.java" />
<option value="$PROJECT_DIR$/pom.xml" />
<option value="$PROJECT_DIR$/src/main/java/tkio/task/AccountTask.java" />
<option value="$PROJECT_DIR$/src/main/java/common/repository/ReminderRepository.java" />
<option value="$PROJECT_DIR$/src/main/java/tkio/task/SendEmailTask.java" />
<option value="$PROJECT_DIR$/pom.xml" />
<option value="$PROJECT_DIR$/src/main/java/tkio/service/impl/SendEmailServiceImpl.java" />
<option value="$PROJECT_DIR$/src/main/resources/spring/applicationContext-schedule.xml" />
<option value="$PROJECT_DIR$/src/main/java/security/interceptor/AuthorizationInterceptor.java" />
</list>
</option>
</component>
......@@ -618,6 +618,62 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="manager" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="manager" />
<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="security" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="manager" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="manager" />
<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="security" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="interceptor" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
</subPane>
</pane>
<pane id="Scratches" />
......@@ -1094,7 +1150,8 @@
<workItem from="1514942069837" duration="3210000" />
<workItem from="1514949451448" duration="1759000" />
<workItem from="1514965514914" duration="4827000" />
<workItem from="1515031568274" duration="11637000" />
<workItem from="1515031568274" duration="15108000" />
<workItem from="1515114726844" duration="41000" />
</task>
<task id="LOCAL-00003" summary="Merge branch 'master' of git.minrow.com:reyun/manager&#10;&#10;# Conflicts:&#10;#&#9;pom.xml&#10;#&#9;target/classes/common.properties&#10;#&#9;target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst&#10;">
<created>1514871143365</created>
......@@ -1264,11 +1321,18 @@
<option name="project" value="LOCAL" />
<updated>1515061586903</updated>
</task>
<option name="localTasksCounter" value="27" />
<task id="LOCAL-00027" summary="sendemail">
<created>1515062373397</created>
<option name="number" value="00027" />
<option name="presentableId" value="LOCAL-00027" />
<option name="project" value="LOCAL" />
<updated>1515062373397</updated>
</task>
<option name="localTasksCounter" value="28" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="94091000" />
<option name="totallyTimeSpent" value="97603000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
......@@ -1285,14 +1349,14 @@
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.24962178" sideWeight="0.5" order="8" 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="9" 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="2" side_tool="false" content_ui="tabs" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.56301147" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.6628478" sideWeight="0.5" order="10" 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.3289689" sideWeight="0.5" order="13" side_tool="false" content_ui="tabs" />
<window_info id="Palette&#9;" 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="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="3" 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="1" 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="4" 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.5155483" sideWeight="0.49546143" 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.5220949" sideWeight="0.49319214" order="9" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4893617" sideWeight="0.49319214" 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="3" 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.5581015" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.27987897" sideWeight="0.5" order="7" side_tool="false" content_ui="combo" />
......@@ -1337,7 +1401,7 @@
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.24962178" sideWeight="0.5" order="9" 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="10" 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="2" side_tool="false" content_ui="tabs" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.56301147" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.20949264" sideWeight="0.5" order="10" 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.3289689" sideWeight="0.5" order="17" 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.3289689" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Palette&#9;" 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" />
......@@ -1346,11 +1410,11 @@
<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="5" side_tool="false" content_ui="tabs" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="14" 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.5155483" sideWeight="0.49546143" 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="true" show_stripe_button="true" weight="0.5220949" sideWeight="0.49319214" order="9" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.5777414" sideWeight="0.49319214" 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="3" 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.5581015" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
<window_info id="CheckStyle" 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="4" side_tool="false" content_ui="tabs" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.27987897" sideWeight="0.5" order="8" side_tool="false" content_ui="combo" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.27987897" sideWeight="0.5" order="8" 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.32980332" sideWeight="0.5" order="6" 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.33" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" />
<window_info id="Gradle View" 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="18" side_tool="false" content_ui="tabs" />
......@@ -1391,7 +1455,8 @@
<MESSAGE value="test pom" />
<MESSAGE value="发邮件" />
<MESSAGE value="pom" />
<option name="LAST_COMMIT_MESSAGE" value="pom" />
<MESSAGE value="sendemail" />
<option name="LAST_COMMIT_MESSAGE" value="sendemail" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
......@@ -1401,8 +1466,26 @@
<properties />
<option name="timeStamp" value="1" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/src/main/java/tkio/task/SendEmailTask.java</url>
<line>102</line>
<properties />
<option name="timeStamp" value="4" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/src/main/java/tkio/task/SendEmailTask.java</url>
<line>75</line>
<properties />
<option name="timeStamp" value="5" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/src/main/java/tkio/task/SendEmailTask.java</url>
<line>50</line>
<properties />
<option name="timeStamp" value="6" />
</line-breakpoint>
</breakpoints>
<option name="time" value="2" />
<option name="time" value="8" />
</breakpoint-manager>
<watches-manager />
</component>
......@@ -1411,13 +1494,6 @@
<option name="FILTER_TARGETS" value="false" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/repository/AppRepository.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="115">
<caret line="10" column="17" lean-forward="false" selection-start-line="10" selection-start-column="17" selection-end-line="10" selection-end-column="17" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/repository/AppCategoryRepository.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="184">
......@@ -1482,9 +1558,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="550">
<caret line="28" column="0" lean-forward="false" selection-start-line="28" selection-start-column="0" selection-end-line="28" selection-end-column="0" />
<folding>
<element signature="imports" expanded="false" />
</folding>
</state>
</provider>
</entry>
......@@ -1564,7 +1637,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="396">
<caret line="18" column="14" lean-forward="false" selection-start-line="18" selection-start-column="14" selection-end-line="18" selection-end-column="14" />
<folding />
</state>
</provider>
</entry>
......@@ -1576,20 +1648,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/service/SendEmailService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="161">
<caret line="7" column="35" lean-forward="true" selection-start-line="7" selection-start-column="35" selection-end-line="7" selection-end-column="35" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/service/impl/SendEmailServiceImpl.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="251">
<caret line="17" column="61" lean-forward="false" selection-start-line="17" selection-start-column="45" selection-end-line="17" selection-end-column="61" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/repository/CodeRepository.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="161">
......@@ -1601,7 +1659,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="368">
<caret line="161" column="0" lean-forward="false" selection-start-line="161" selection-start-column="0" selection-end-line="161" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
......@@ -1617,7 +1674,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-2">
<caret line="14" column="13" lean-forward="false" selection-start-line="14" selection-start-column="13" selection-end-line="14" selection-end-column="13" />
<folding />
</state>
</provider>
</entry>
......@@ -1625,7 +1681,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="260">
<caret line="74" column="43" lean-forward="false" selection-start-line="74" selection-start-column="43" selection-end-line="74" selection-end-column="43" />
<folding />
</state>
</provider>
</entry>
......@@ -1633,10 +1688,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="194">
<caret line="64" column="16" lean-forward="false" selection-start-line="64" selection-start-column="16" selection-end-line="64" selection-end-column="16" />
<folding>
<element signature="e#1102#1103#0" expanded="false" />
<element signature="e#1120#1121#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
......@@ -1644,15 +1695,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="237">
<caret line="17" column="15" lean-forward="false" selection-start-line="17" selection-start-column="15" selection-end-line="17" selection-end-column="15" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/dic/RoleEnum.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="184">
<caret line="8" column="4" lean-forward="false" selection-start-line="8" selection-start-column="4" selection-end-line="8" selection-end-column="4" />
<folding />
</state>
</provider>
</entry>
......@@ -1660,7 +1702,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="184">
<caret line="8" column="4" lean-forward="false" selection-start-line="8" selection-start-column="4" selection-end-line="8" selection-end-column="4" />
<folding />
</state>
</provider>
</entry>
......@@ -1668,7 +1709,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="366">
<caret line="34" column="11" lean-forward="false" selection-start-line="34" selection-start-column="4" selection-end-line="34" selection-end-column="11" />
<folding />
</state>
</provider>
</entry>
......@@ -1676,7 +1716,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="596">
<caret line="209" column="5" lean-forward="false" selection-start-line="209" selection-start-column="5" selection-end-line="209" selection-end-column="5" />
<folding />
</state>
</provider>
</entry>
......@@ -1684,7 +1723,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="253">
<caret line="13" column="15" lean-forward="false" selection-start-line="13" selection-start-column="15" selection-end-line="13" selection-end-column="15" />
<folding />
</state>
</provider>
</entry>
......@@ -1692,7 +1730,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="298">
<caret line="196" column="13" lean-forward="true" selection-start-line="196" selection-start-column="13" selection-end-line="196" selection-end-column="13" />
<folding />
</state>
</provider>
</entry>
......@@ -1700,7 +1737,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1656">
<caret line="86" column="53" lean-forward="false" selection-start-line="86" selection-start-column="53" selection-end-line="86" selection-end-column="53" />
<folding />
</state>
</provider>
</entry>
......@@ -1708,15 +1744,20 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="237">
<caret line="29" column="31" lean-forward="false" selection-start-line="29" selection-start-column="31" selection-end-line="29" selection-end-column="31" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pom.xml">
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/task/AccountTask.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="306">
<caret line="67" column="44" lean-forward="false" selection-start-line="67" selection-start-column="44" selection-end-line="67" selection-end-column="44" />
<folding />
<state relative-caret-position="114">
<caret line="41" column="16" lean-forward="false" selection-start-line="41" selection-start-column="16" selection-end-line="41" selection-end-column="16" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/service/SendEmailService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="184">
<caret line="8" column="9" lean-forward="false" selection-start-line="8" selection-start-column="9" selection-end-line="8" selection-end-column="9" />
</state>
</provider>
</entry>
......@@ -1724,12 +1765,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="92">
<caret line="14" column="27" lean-forward="false" selection-start-line="14" selection-start-column="19" selection-end-line="14" selection-end-column="27" />
<folding>
<element signature="e#3873#3874#0" expanded="true" />
<element signature="e#3904#3905#0" expanded="true" />
<element signature="e#3952#3953#0" expanded="true" />
<element signature="e#3992#3993#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
......@@ -1737,38 +1772,60 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="84">
<caret line="114" column="0" lean-forward="false" selection-start-line="114" selection-start-column="0" selection-end-line="114" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/dic/RoleEnum.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="184">
<caret line="8" column="4" lean-forward="false" selection-start-line="8" selection-start-column="4" selection-end-line="8" selection-end-column="4" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pom.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1403">
<caret line="61" column="45" lean-forward="false" selection-start-line="61" selection-start-column="45" selection-end-line="61" selection-end-column="45" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/task/AccountTask.java">
<entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-schedule.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="44" column="19" lean-forward="true" selection-start-line="44" selection-start-column="19" selection-end-line="44" selection-end-column="19" />
<state relative-caret-position="552">
<caret line="24" column="63" lean-forward="false" selection-start-line="24" selection-start-column="63" selection-end-line="24" selection-end-column="63" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/security/interceptor/AuthorizationInterceptor.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="87">
<caret line="50" column="0" lean-forward="false" selection-start-line="50" selection-start-column="0" selection-end-line="50" selection-end-column="0" />
<state relative-caret-position="23">
<caret line="49" column="57" lean-forward="false" selection-start-line="49" selection-start-column="57" selection-end-line="49" selection-end-column="57" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/task/SendEmailTask.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="194">
<caret line="47" column="16" lean-forward="false" selection-start-line="47" selection-start-column="16" selection-end-line="47" selection-end-column="16" />
<state relative-caret-position="422">
<caret line="130" column="33" lean-forward="false" selection-start-line="130" selection-start-column="33" selection-end-line="130" selection-end-column="33" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-schedule.xml">
<entry file="file://$PROJECT_DIR$/src/main/java/common/repository/ReminderRepository.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="299">
<caret line="20" column="138" lean-forward="false" selection-start-line="20" selection-start-column="138" selection-end-line="20" selection-end-column="138" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/service/impl/SendEmailServiceImpl.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="177">
<caret line="24" column="69" lean-forward="false" selection-start-line="24" selection-start-column="69" selection-end-line="24" selection-end-column="69" />
<state relative-caret-position="228">
<caret line="31" column="87" lean-forward="false" selection-start-line="31" selection-start-column="87" selection-end-line="31" selection-end-column="87" />
<folding />
</state>
</provider>
......
pom.xml
......@@ -58,8 +58,8 @@
<dmp.password>reyun123</dmp.password>
<mail.host>smtp.exmail.qq.com</mail.host>
<mail.username>service1@reyun.com</mail.username>
<mail.password>XSW29ijn</mail.password>
<mail.username>manxiaoqiang@reyun.com</mail.username>
<mail.password>Mxq123</mail.password>
<mail.content_type>text/plain;charset\=GBK</mail.content_type>
<mail.list>zhangliang</mail.list>
<!-- 单位是分钟-->
......
src/main/java/common/repository/ReminderRepository.java
......@@ -18,6 +18,6 @@ public interface ReminderRepository extends JpaRepository<Reminder, Long> {
@Query(value = "SELECT * from reminder where id in (select max(id) from reminder where platform = ?1 group by account_id )", nativeQuery = true)
List<Reminder> findAllDistinct(String platform);
@Query(value = "SELECT * from reminder where id in (select max(id) from reminder where platform = ?1 group by account_id ) and status = false", nativeQuery = true)
@Query(value = "SELECT * from reminder where id in (select max(id) from reminder where platform = ?1 group by account_id ) and remind_status = false", nativeQuery = true)
List<Reminder> findAllDistinctFalse(String platform);
}
src/main/java/security/interceptor/AuthorizationInterceptor.java
......@@ -14,6 +14,7 @@ import util.StringUtil;
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.Enumeration;
public class AuthorizationInterceptor extends HandlerInterceptorAdapter {
private static final Logger logger = LoggerFactory.getLogger(AuthorizationInterceptor.class);
......
src/main/java/tkio/service/impl/SendEmailServiceImpl.java
......@@ -7,6 +7,7 @@ import tkio.repository.SalesManLeaderRepository;
import tkio.service.SalesManService;
import tkio.service.SendEmailService;
import util.MailUtils;
import util.ValidateUtil;
import java.util.ArrayList;
import java.util.List;
......@@ -20,12 +21,19 @@ public class SendEmailServiceImpl implements SendEmailService {
@Override
public void send(String email, List<String> content) {
String contentStr = String.join(",", content);
StringBuffer sb = new StringBuffer();
if(ValidateUtil.isValid(content)){
for(String e : content){
sb.append(e).append("\r\n");
}
List<String> list = new ArrayList<>();
list.add(email);
try {
MailUtils.sendSimpleEmail("账号过期提醒", "以下账号过期了,请及时处理 : " + contentStr,list);
MailUtils.sendSimpleEmail("账号过期提醒", "以下账号过期了,请及时处理 : " + sb.toString(),list);
} catch (Exception e) {
e.printStackTrace();
}
}
}
}
src/main/java/tkio/task/SendEmailTask.java
......@@ -108,11 +108,11 @@ public class SendEmailTask {
if (reMap.containsKey(em)){
if(reMap.get(em)){
newList.add(em);
}
}else{
newList.add(em);
}
}
}
//sendEmail
sendEmailService.send(user.getEmail(), newList);
} else if(saleMap.containsKey(user.getId())){
......@@ -125,13 +125,13 @@ public class SendEmailTask {
if (reMap.containsKey(em)){
if(reMap.get(em)){
newList.add(em);
}
}else{
newList.add(em);
}
}
}
}
}
//sendEmail
sendEmailService.send(user.getEmail(), newList);
}
......
src/main/resources/spring/applicationContext-schedule.xml
......@@ -22,7 +22,7 @@
<bean id="emailTask" class="tkio.task.SendEmailTask"></bean>
<task:scheduled-tasks>
<task:scheduled ref="emailTask" method="task" cron="* * * */2 * ?"/>
<task:scheduled ref="emailTask" method="task" cron="0 7 19 * * ?"/>
</task:scheduled-tasks>
<bean id="trackAccountTask" class="track.task.AccountTask"></bean>
......
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