Skip to content

李洋 / 消息系统

Go to a project
Commit fd3e3205 by 孙龙
Options

Merge branch 'master' of http://119.23.72.7/liyang/CMS-Message 

# Conflicts:
#	.idea/workspace.xml
parents 1dd13001 9665e20f
Inline Side-by-side
Showing with 389 additions and 216 deletions
.idea/workspace.xml
......@@ -2,14 +2,16 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="5adaf67b-2f8e-4572-8a6c-38631037f4b7" name="Default" comment="">
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/blade.xml" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/copyright/profiles_settings.xml" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/encodings.xml" />
<change type="DELETED" beforePath="$PROJECT_DIR$/.idea/inspectionProfiles/Project_Default.xml" afterPath="" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/doc/lie_delay_message.sql" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/doc/lie_failed_jobs.sql" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/doc/lie_msg_channel_tpl.sql" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/doc/lie_msg_log.sql" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/doc/lie_msg_tpl.sql" />
<change type="DELETED" beforePath="$PROJECT_DIR$/doc/基石系统数据库文档V3.docx" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/doc/基石系统错误码.docx" afterPath="" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/resources/views/message.blade.php" afterPath="$PROJECT_DIR$/resources/views/message.blade.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/robots.txt" afterPath="$PROJECT_DIR$/public/robots.txt" />
</list>
<ignored path=".idea/dataSources.local.xml" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
<option name="SHOW_DIALOG" value="false" />
......@@ -27,31 +29,81 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="routes.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/Http/routes.php">
<file leaf-file-name="sendmanualmessage.blade.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/resources/views/message/sendmanualmessage.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-6.0338984">
<caret line="64" column="23" selection-start-line="64" selection-start-column="17" selection-end-line="64" selection-end-column="23" />
<state vertical-scroll-proportion="0.0">
<caret line="5" column="48" selection-start-line="5" selection-start-column="48" selection-end-line="5" selection-end-column="48" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="MessageController.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/MessageController.php">
<file leaf-file-name="message.blade.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/resources/views/message.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="13.593221">
<caret line="176" column="33" selection-start-line="176" selection-start-column="21" selection-end-line="176" selection-end-column="33" />
<state vertical-scroll-proportion="0.0">
<caret line="7" column="25" selection-start-line="7" selection-start-column="25" selection-end-line="7" selection-end-column="25" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="message.blade.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/resources/views/message.blade.php">
<file leaf-file-name="controller.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/public/js/Message/editor/php/controller.php">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="16" column="14" selection-start-line="16" selection-start-column="14" selection-end-line="16" selection-end-column="14" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name=".env" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/.env">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.11547344">
<caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
<state vertical-scroll-proportion="0.022371365">
<caret line="16" column="34" selection-start-line="16" selection-start-column="34" selection-end-line="16" selection-end-column="34" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="action_upload.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/public/js/Message/editor/php/action_upload.php">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="14" column="24" selection-start-line="14" selection-start-column="24" selection-end-line="14" selection-end-column="24" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="Uploader.class.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/public/js/Message/editor/php/Uploader.class.php">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="6" column="46" selection-start-line="6" selection-start-column="46" selection-end-line="6" selection-end-column="46" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="autoload.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/vendor/OSS/autoload.php">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="10" column="37" selection-start-line="10" selection-start-column="37" selection-end-line="10" selection-end-column="37" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="msgconfig.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/config/msgconfig.php">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="32" column="54" selection-start-line="32" selection-start-column="54" selection-end-line="32" selection-end-column="54" />
<folding />
</state>
</provider>
......@@ -61,8 +113,6 @@
</component>
<component name="FindInProjectRecents">
<findStrings>
<find>RedisDB::connection()</find>
<find>redisRemove</find>
<find>supplier</find>
<find>addsu</find>
<find>attr</find>
......@@ -91,6 +141,8 @@
<find>p-l</find>
<find>actual_send_time</find>
<find>sendman</find>
<find>prefix</find>
<find>upload</find>
</findStrings>
</component>
<component name="Git.Settings">
......@@ -99,11 +151,6 @@
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/resources/views/footstone/categorylist.blade.php" />
<option value="$PROJECT_DIR$/public/js/FootStone/brandmapping.js" />
<option value="$PROJECT_DIR$/storage/framework/views/9a70eaec3195d8fea8b7ca663df9151d3e1d51d4.php" />
<option value="$PROJECT_DIR$/resources/views/footstone/maintainbrand.blade.php" />
<option value="$PROJECT_DIR$/resources/views/footstone/mappingclassifylist.blade.php" />
<option value="$PROJECT_DIR$/resources/views/footstone.blade.php" />
<option value="$PROJECT_DIR$/public/js/FootStone/classifymapping.js" />
<option value="$PROJECT_DIR$/public/js/FootStone/addclassify.js" />
......@@ -132,7 +179,7 @@
<option value="$PROJECT_DIR$/app/Http/routes.php" />
<option value="$PROJECT_DIR$/app/Http/Controllers/TablePageController.php" />
<option value="$PROJECT_DIR$/config/website.php" />
<option value="$PROJECT_DIR$/resources/views/common.blade.php" />
<option value="$PROJECT_DIR$/.env" />
<option value="$PROJECT_DIR$/resources/views/message/AllHistoryList.blade.php" />
<option value="$PROJECT_DIR$/resources/views/message/TemplateList.blade.php" />
<option value="$PROJECT_DIR$/public/js/Message/SendManualMessage.js" />
......@@ -142,14 +189,19 @@
<option value="$PROJECT_DIR$/app/Http/function.php" />
<option value="$PROJECT_DIR$/app/Providers/AppServiceProvider.php" />
<option value="$PROJECT_DIR$/config/database.php" />
<option value="$PROJECT_DIR$/config/msgconfig.php" />
<option value="$PROJECT_DIR$/public/js/Message/allhistorylist.js" />
<option value="$PROJECT_DIR$/resources/views/message/allhistorylist.blade.php" />
<option value="$PROJECT_DIR$/resources/views/message/manualhistorylist.blade.php" />
<option value="$PROJECT_DIR$/public/js/Message/manualhistorylist.js" />
<option value="$PROJECT_DIR$/app/Http/Controllers/MessageController.php" />
<option value="$PROJECT_DIR$/.env" />
<option value="$PROJECT_DIR$/public/js/Message/manualhistorylist.js" />
<option value="$PROJECT_DIR$/resources/views/message/manualhistorylist.blade.php" />
<option value="$PROJECT_DIR$/config/msgconfig.php" />
<option value="$PROJECT_DIR$/resources/views/index.blade.php" />
<option value="$PROJECT_DIR$/resources/views/message.blade.php" />
<option value="$PROJECT_DIR$/resources/views/common.blade.php" />
<option value="$PROJECT_DIR$/public/js/Message/editor/php/config.json" />
<option value="$PROJECT_DIR$/public/js/Message/editor/php/controller.php" />
<option value="$PROJECT_DIR$/public/js/Message/editor/php/action_upload.php" />
<option value="$PROJECT_DIR$/public/js/Message/editor/php/Uploader.class.php" />
</list>
</option>
</component>
......@@ -205,6 +257,8 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="Scope" />
<pane id="Scratches" />
<pane id="ProjectPane">
<subPane>
<PATH>
......@@ -213,111 +267,13 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="CMS-Message" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="CMS-Message" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="CMS-Message" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="CMS-Message" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="resources" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="views" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="CMS-Message" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="CMS-Message" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="resources" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="CMS-Message" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="CMS-Message" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="app" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="CMS-Message" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="CMS-Message" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="app" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="Http" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="CMS-Message" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="CMS-Message" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="app" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="Http" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="Controllers" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
</subPane>
</pane>
<pane id="Scope" />
<pane id="Scratches" />
</panes>
</component>
<component name="PropertiesComponent">
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="last_opened_file_path" value="$PROJECT_DIR$" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/../CMS-Marketing" />
<property name="settings.editor.selected.configurable" value="preferences.lookFeel" />
<property name="SearchEverywhereHistoryKey" value="&#9;FILE&#9;file:///Users/leo/WorkSpace/CMS-Message/app/Http/Controllers/MessageController.php&#10;ueditor&#9;FILE&#9;file:///Users/leo/WorkSpace/FootStone/public/js/FootStone/editor/ueditor.all.js&#10;maximumwor&#9;null&#9;null&#10;entertag&#9;null&#9;null&#10;allowDivtranstop&#9;null&#9;null&#10;autoheightenabled&#9;null&#9;null&#10;autoheightenablel&#9;null&#9;null&#10;autoHeightEn&#9;null&#9;null&#10;toolbars&#9;null&#9;null&#10;ueditor.all&#9;FILE&#9;file:///Users/leo/WorkSpace/FootStone/public/js/FootStone/editor/ueditor.all.js&#10;Filesystem.php&#9;FILE&#9;file:///Users/leo/WorkSpace/FootStone/vendor/laravel/framework/src/Illuminate/Filesystem/Filesystem.php&#10;view.&#9;FILE&#9;file:///Users/leo/WorkSpace/FootStone/vendor/laravel/framework/src/Illuminate/View/View.php&#10;.env&#9;FILE&#9;file:///Users/leo/WorkSpace/FootStone/.env" />
</component>
......@@ -341,31 +297,6 @@
</list>
</option>
</component>
<component name="RunManager">
<configuration default="true" type="JavascriptDebugType" factoryName="JavaScript Debug">
<method />
</configuration>
<configuration default="true" type="PHPUnitRunConfigurationType" factoryName="PHPUnit">
<TestRunner />
<method />
</configuration>
<configuration default="true" type="PhpBehatConfigurationType" factoryName="Behat">
<BehatRunner />
<method />
</configuration>
<configuration default="true" type="PhpLocalRunConfigurationType" factoryName="PHP Console">
<method />
</configuration>
<configuration default="true" type="js.build_tools.gulp" factoryName="Gulp.js">
<method />
</configuration>
<configuration default="true" type="js.build_tools.npm" factoryName="npm">
<command value="run-script" />
<scripts />
<envs />
<method />
</configuration>
</component>
<component name="ShelveChangesManager" show_recycled="false" />
<component name="SvnConfiguration">
<configuration />
......@@ -402,21 +333,25 @@
<workItem from="1511349105256" duration="62492000" />
<workItem from="1512031766599" duration="29538000" />
<workItem from="1540521897225" duration="14369000" />
<workItem from="1540869353045" duration="13419000" />
<workItem from="1540869353045" duration="13961000" />
<workItem from="1541645770993" duration="441000" />
<workItem from="1541744198782" duration="3545000" />
<workItem from="1548223821569" duration="70000" />
<workItem from="1550737517559" duration="26000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="708132000" />
<option name="totallyTimeSpent" value="712756000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
<editor active="true" />
<layout>
<window_info id="Gulp" 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="true" 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.1433902" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.2228145" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<window_info id="TODO" 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="6" side_tool="false" content_ui="tabs" />
<window_info id="版本控制" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="版本控制" 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="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32980332" sideWeight="0.5" order="7" side_tool="true" 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.33" sideWeight="0.5" order="3" 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" />
......@@ -447,61 +382,67 @@
<watches-manager />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/.env">
<entry file="file://$PROJECT_DIR$/resources/views/message/sendmanualmessage.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<caret line="5" column="48" selection-start-line="5" selection-start-column="48" selection-end-line="5" selection-end-column="48" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/.env">
<entry file="file://$PROJECT_DIR$/resources/views/message.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<caret line="7" column="25" selection-start-line="7" selection-start-column="25" selection-end-line="7" selection-end-column="25" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/message/allhistorylist.blade.php">
<entry file="file://$PROJECT_DIR$/public/js/Message/editor/php/controller.php">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="8" column="5" selection-start-line="8" selection-start-column="5" selection-end-line="8" selection-end-column="5" />
<caret line="16" column="14" selection-start-line="16" selection-start-column="14" selection-end-line="16" selection-end-column="14" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/message/manualhistorylist.blade.php">
<entry file="file://$PROJECT_DIR$/.env">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="20" column="64" selection-start-line="20" selection-start-column="45" selection-end-line="20" selection-end-column="64" />
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/js/Message/manualhistorylist.js">
<entry file="file://$PROJECT_DIR$/public/js/Message/editor/php/action_upload.php">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="80" column="3" selection-start-line="80" selection-start-column="3" selection-end-line="80" selection-end-column="3" />
<caret line="14" column="24" selection-start-line="14" selection-start-column="24" selection-end-line="14" selection-end-column="24" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/js/Message/allhistorylist.js">
<entry file="file://$PROJECT_DIR$/public/js/Message/editor/php/Uploader.class.php">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="46" column="37" selection-start-line="46" selection-start-column="21" selection-end-line="46" selection-end-column="37" />
<caret line="6" column="46" selection-start-line="6" selection-start-column="46" selection-end-line="6" selection-end-column="46" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/MessageController.php">
<entry file="file://$PROJECT_DIR$/vendor/OSS/autoload.php">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<caret line="10" column="37" selection-start-line="10" selection-start-column="37" selection-end-line="10" selection-end-column="37" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/Controller.php">
<entry file="file://$PROJECT_DIR$/config/msgconfig.php">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="9" column="6" selection-start-line="9" selection-start-column="6" selection-end-line="9" selection-end-column="6" />
<caret line="32" column="54" selection-start-line="32" selection-start-column="54" selection-end-line="32" selection-end-column="54" />
<folding />
</state>
</provider>
</entry>
......@@ -554,13 +495,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/common.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="17" column="7" selection-start-line="17" selection-start-column="7" selection-end-line="17" selection-end-column="7" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/config/website.php">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
......@@ -631,17 +565,11 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/message/sendmanualmessage.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="243" column="90" selection-start-line="243" selection-start-column="90" selection-end-line="243" selection-end-column="90" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Http/function.php">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="806" column="1" selection-start-line="806" selection-start-column="1" selection-end-line="806" selection-end-column="1" />
<folding />
</state>
</provider>
</entry>
......@@ -652,10 +580,10 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/config/msgconfig.php">
<entry file="file://$PROJECT_DIR$/config/database.php">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="36" column="20" selection-start-line="36" selection-start-column="20" selection-end-line="36" selection-end-column="20" />
<caret line="167" column="24" selection-start-line="167" selection-start-column="24" selection-end-line="167" selection-end-column="24" />
</state>
</provider>
</entry>
......@@ -687,79 +615,126 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/js/Message/manualhistorylist.js">
<entry file="file://$PROJECT_DIR$/resources/views/message/allhistorylist.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="80" column="3" selection-start-line="80" selection-start-column="3" selection-end-line="80" selection-end-column="3" />
<caret line="8" column="5" selection-start-line="8" selection-start-column="5" selection-end-line="8" selection-end-column="5" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/message/manualhistorylist.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="20" column="64" selection-start-line="20" selection-start-column="45" selection-end-line="20" selection-end-column="64" />
<caret line="53" column="80" selection-start-line="53" selection-start-column="80" selection-end-line="53" selection-end-column="80" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/message/allhistorylist.blade.php">
<entry file="file://$PROJECT_DIR$/public/js/Message/manualhistorylist.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.023094688">
<caret line="8" column="5" selection-start-line="8" selection-start-column="5" selection-end-line="8" selection-end-column="5" />
<state vertical-scroll-proportion="0.0">
<caret line="49" column="84" selection-start-line="49" selection-start-column="84" selection-end-line="49" selection-end-column="84" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/config/auth.php">
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/MessageController.php">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
<caret line="405" column="28" selection-start-line="405" selection-start-column="18" selection-end-line="405" selection-end-column="28" />
<folding>
<element signature="e#120#146#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/config/database.php">
<entry file="file://$PROJECT_DIR$/config/msgconfig.php">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-25.344828">
<caret line="167" column="24" selection-start-line="167" selection-start-column="24" selection-end-line="167" selection-end-column="24" />
<state vertical-scroll-proportion="0.0">
<caret line="32" column="54" selection-start-line="32" selection-start-column="54" selection-end-line="32" selection-end-column="54" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/config/compile.php">
<entry file="file://$PROJECT_DIR$/resources/views/message/sendmanualmessage.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<caret line="5" column="48" selection-start-line="5" selection-start-column="48" selection-end-line="5" selection-end-column="48" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/.env">
<entry file="file://$PROJECT_DIR$/resources/views/index.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="6" column="81" selection-start-line="6" selection-start-column="81" selection-end-line="6" selection-end-column="81" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/message.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="1.1843575">
<caret line="53" column="30" selection-start-line="53" selection-start-column="30" selection-end-line="53" selection-end-column="30" />
<state vertical-scroll-proportion="0.0">
<caret line="7" column="25" selection-start-line="7" selection-start-column="25" selection-end-line="7" selection-end-column="25" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/common.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="18" column="22" selection-start-line="18" selection-start-column="22" selection-end-line="18" selection-end-column="22" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/js/Message/editor/php/config.json">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="10" column="40" selection-start-line="10" selection-start-column="40" selection-end-line="10" selection-end-column="40" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Http/routes.php">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-6.0338984">
<caret line="64" column="23" selection-start-line="64" selection-start-column="17" selection-end-line="64" selection-end-column="23" />
<state vertical-scroll-proportion="0.0">
<caret line="63" column="51" selection-start-line="63" selection-start-column="51" selection-end-line="63" selection-end-column="51" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/MessageController.php">
<entry file="file://$PROJECT_DIR$/vendor/OSS/autoload.php">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="13.593221">
<caret line="176" column="33" selection-start-line="176" selection-start-column="21" selection-end-line="176" selection-end-column="33" />
<state vertical-scroll-proportion="0.0">
<caret line="10" column="37" selection-start-line="10" selection-start-column="37" selection-end-line="10" selection-end-column="37" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/message.blade.php">
<entry file="file://$PROJECT_DIR$/public/js/Message/editor/php/Uploader.class.php">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="6" column="46" selection-start-line="6" selection-start-column="46" selection-end-line="6" selection-end-column="46" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/js/Message/editor/php/action_upload.php">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="14" column="24" selection-start-line="14" selection-start-column="24" selection-end-line="14" selection-end-column="24" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/js/Message/editor/php/controller.php">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="16" column="14" selection-start-line="16" selection-start-column="14" selection-end-line="16" selection-end-column="14" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/.env">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.11547344">
<caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
<state vertical-scroll-proportion="0.022371365">
<caret line="16" column="34" selection-start-line="16" selection-start-column="34" selection-end-line="16" selection-end-column="34" />
<folding />
</state>
</provider>
......
doc/lie_delay_message.sql 0 → 100644
/*
Navicat MySQL Data Transfer
Source Server : 192.168.1.232
Source Server Type : MySQL
Source Server Version : 50548
Source Host : 192.168.1.232
Source Database : liexin_message
Target Server Type : MySQL
Target Server Version : 50548
File Encoding : utf-8
Date: 02/21/2019 16:32:13 PM
*/
SET NAMES utf8;
SET FOREIGN_KEY_CHECKS = 0;
-- ----------------------------
-- Table structure for `lie_delay_message`
-- ----------------------------
DROP TABLE IF EXISTS `lie_delay_message`;
CREATE TABLE `lie_delay_message` (
`id` int(10) unsigned NOT NULL AUTO_INCREMENT,
`queue` varchar(200) NOT NULL DEFAULT '' COMMENT '队列名',
`content` text NOT NULL COMMENT '消息内容',
`status` tinyint(1) unsigned DEFAULT '0' COMMENT '1 已经处理了 5处理失败',
`create_time` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '创建时间',
`update_time` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '修改时间',
`expect_send_time` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '期望发送时间',
PRIMARY KEY (`id`)
) ENGINE=InnoDB AUTO_INCREMENT=194 DEFAULT CHARSET=utf8mb4 COMMENT='延时消息任务表';
SET FOREIGN_KEY_CHECKS = 1;
doc/lie_failed_jobs.sql 0 → 100644
/*
Navicat MySQL Data Transfer
Source Server : 192.168.1.232
Source Server Type : MySQL
Source Server Version : 50548
Source Host : 192.168.1.232
Source Database : liexin_message
Target Server Type : MySQL
Target Server Version : 50548
File Encoding : utf-8
Date: 02/21/2019 16:32:19 PM
*/
SET NAMES utf8;
SET FOREIGN_KEY_CHECKS = 0;
-- ----------------------------
-- Table structure for `lie_failed_jobs`
-- ----------------------------
DROP TABLE IF EXISTS `lie_failed_jobs`;
CREATE TABLE `lie_failed_jobs` (
`id` int(10) unsigned NOT NULL AUTO_INCREMENT,
`connection` varchar(255) COLLATE utf8_unicode_ci NOT NULL DEFAULT '' COMMENT '连接名称',
`queue` varchar(255) COLLATE utf8_unicode_ci NOT NULL DEFAULT '' COMMENT '队列名称',
`payload` text COLLATE utf8_unicode_ci NOT NULL COMMENT '消息内容',
`failed_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
PRIMARY KEY (`id`)
) ENGINE=InnoDB AUTO_INCREMENT=262 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='消息失败表';
SET FOREIGN_KEY_CHECKS = 1;
doc/lie_msg_channel_tpl.sql 0 → 100644
/*
Navicat MySQL Data Transfer
Source Server : 192.168.1.232
Source Server Type : MySQL
Source Server Version : 50548
Source Host : 192.168.1.232
Source Database : liexin_message
Target Server Type : MySQL
Target Server Version : 50548
File Encoding : utf-8
Date: 02/21/2019 16:32:24 PM
*/
SET NAMES utf8;
SET FOREIGN_KEY_CHECKS = 0;
-- ----------------------------
-- Table structure for `lie_msg_channel_tpl`
-- ----------------------------
DROP TABLE IF EXISTS `lie_msg_channel_tpl`;
CREATE TABLE `lie_msg_channel_tpl` (
`channel_tpl_id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '渠道模板id',
`tpl_id` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '模板id',
`channel_type` tinyint(1) unsigned NOT NULL DEFAULT '1' COMMENT '渠道类型（1、站内信 2、短信 3、邮箱 4、微信通知）',
`title` varchar(64) NOT NULL DEFAULT '' COMMENT '消息标题(若微信，则存放模板消息id)',
`content` text NOT NULL COMMENT '消息内容',
`op_type` tinyint(1) unsigned NOT NULL DEFAULT '1' COMMENT '点击操作类型（1、打开消息，展示消息内容；2、点击站内信标题，跳转url）',
`create_time` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '创建时间',
`update_time` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '更新时间',
`url` varchar(255) DEFAULT '' COMMENT '跳转url',
`ex_int` int(11) DEFAULT '0' COMMENT '备用字段整形',
`ex_str` varchar(255) DEFAULT '' COMMENT '备用字段字符串',
PRIMARY KEY (`channel_tpl_id`),
KEY `tpl_id` (`tpl_id`) USING BTREE,
KEY `channel_type` (`channel_type`) USING BTREE
) ENGINE=InnoDB AUTO_INCREMENT=311 DEFAULT CHARSET=utf8;
SET FOREIGN_KEY_CHECKS = 1;
doc/lie_msg_log.sql 0 → 100644
/*
Navicat MySQL Data Transfer
Source Server : 192.168.1.232
Source Server Type : MySQL
Source Server Version : 50548
Source Host : 192.168.1.232
Source Database : liexin_message
Target Server Type : MySQL
Target Server Version : 50548
File Encoding : utf-8
Date: 02/21/2019 16:32:30 PM
*/
SET NAMES utf8;
SET FOREIGN_KEY_CHECKS = 0;
-- ----------------------------
-- Table structure for `lie_msg_log`
-- ----------------------------
DROP TABLE IF EXISTS `lie_msg_log`;
CREATE TABLE `lie_msg_log` (
`log_id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '消息日志id',
`status` tinyint(1) NOT NULL DEFAULT '-2' COMMENT '消息状态（-4：已删除 -3：已取消 -2：待发送 -1：发送失败 1：发送成功 2：已读）',
`obj_user` varchar(32) NOT NULL DEFAULT '0' COMMENT '目标用户',
`source_type` tinyint(1) unsigned NOT NULL DEFAULT '1' COMMENT '消息来源类型（1、功能性消息 2、营销型消息）',
`tpl_id` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '模板id',
`channel_type` varchar(32) NOT NULL DEFAULT '1' COMMENT '渠道类型（1、站内信 2、短信 3、邮箱 4、微信通知）',
`create_time` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '创建时间',
`expect_send_time` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '期望发送时间',
`actual_send_time` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '实际发送时间',
`title` varchar(64) NOT NULL DEFAULT '' COMMENT '标题',
`content` text NOT NULL COMMENT '内容',
`wechat_tpl_id` int(64) unsigned NOT NULL DEFAULT '0' COMMENT '微信模板id',
`ex_int` int(11) DEFAULT '0' COMMENT '备用字段整形',
`ex_str` varchar(255) DEFAULT '' COMMENT '备用字段字符串',
PRIMARY KEY (`log_id`),
KEY `status` (`status`) USING BTREE,
KEY `obj_user` (`obj_user`) USING BTREE,
KEY `source_type` (`source_type`) USING BTREE,
KEY `tpl_id` (`tpl_id`) USING BTREE,
KEY `channel_type` (`channel_type`) USING BTREE,
KEY `expect_send_time` (`expect_send_time`) USING BTREE
) ENGINE=InnoDB AUTO_INCREMENT=8536 DEFAULT CHARSET=utf8;
SET FOREIGN_KEY_CHECKS = 1;
doc/lie_msg_tpl.sql 0 → 100644
/*
Navicat MySQL Data Transfer
Source Server : 192.168.1.232
Source Server Type : MySQL
Source Server Version : 50548
Source Host : 192.168.1.232
Source Database : liexin_message
Target Server Type : MySQL
Target Server Version : 50548
File Encoding : utf-8
Date: 02/21/2019 16:32:35 PM
*/
SET NAMES utf8;
SET FOREIGN_KEY_CHECKS = 0;
-- ----------------------------
-- Table structure for `lie_msg_tpl`
-- ----------------------------
DROP TABLE IF EXISTS `lie_msg_tpl`;
CREATE TABLE `lie_msg_tpl` (
`tpl_id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '消息模板id',
`channels` varchar(32) NOT NULL DEFAULT '1' COMMENT '渠道类型(1、站内信 2、短信 3、邮箱 4微信通知 可多选 用逗号隔开 eg:1,2,3)',
`msg_type` tinyint(1) unsigned NOT NULL DEFAULT '1' COMMENT '消息类型（1、公告 2、活动 3、新闻）',
`source_type` tinyint(1) unsigned NOT NULL DEFAULT '1' COMMENT '消息来源类型（1、功能性消息 2、营销型消息）',
`creater` varchar(255) NOT NULL DEFAULT '' COMMENT '创建人',
`obj_user` text NOT NULL COMMENT '目标用户(存手机号(或邮箱),逗号隔开)',
`create_time` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '创建时间',
`update_time` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '更新时间',
`description` varchar(32) DEFAULT '' COMMENT '消息描述（不做前台展示，加强理解使用）',
`ex_int` int(11) DEFAULT '0' COMMENT '备用字段整形',
`ex_str` varchar(255) NOT NULL DEFAULT '' COMMENT '备用字段字符串',
`expect_send_time` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '预期发布时间',
PRIMARY KEY (`tpl_id`),
KEY `channels` (`channels`) USING BTREE
) ENGINE=InnoDB AUTO_INCREMENT=177 DEFAULT CHARSET=utf8 COMMENT='obj_user 只针对手动发送，自动发送无需目标用户，直接调用接口与模板对应';
SET FOREIGN_KEY_CHECKS = 1;
doc/基石系统错误码.docx deleted 100644 → 0
No preview for this file type
public/robots.txt
User-agent: *
Disallow:
Disallow:/
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 sign in to comment