Skip to content

B
bi-report
Commit e5d2ae02 authored by 魏艺敏's avatar 魏艺敏
Browse files
Options

Merge branch 'master' of http://git.wanmeizhensuo.com/zhaojianwei/bi-report into weiyimin 

 Conflicts:
	.idea/workspace.xml
parents d4175ee0 a44ddc3a
Show whitespace changes
Inline Side-by-side
Showing with 196 additions and 81 deletions
.idea/workspace.xml
View file @ e5d2ae02
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="BranchesTreeState">
<expand>
<path>
<item name="ROOT" type="e8cecc67:BranchNodeDescriptor" />
<item name="LOCAL_ROOT" type="e8cecc67:BranchNodeDescriptor" />
</path>
<path>
<item name="ROOT" type="e8cecc67:BranchNodeDescriptor" />
<item name="REMOTE_ROOT" type="e8cecc67:BranchNodeDescriptor" />
</path>
<path>
<item name="ROOT" type="e8cecc67:BranchNodeDescriptor" />
<item name="REMOTE_ROOT" type="e8cecc67:BranchNodeDescriptor" />
<item name="GROUP_NODE:origin" type="e8cecc67:BranchNodeDescriptor" />
</path>
</expand>
<select />
</component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="18c38e3b-9b7f-4a3f-b141-edcb320b1d24" name="Default Changelist" comment=""> <list default="true" id="18c38e3b-9b7f-4a3f-b141-edcb320b1d24" name="Default Changelist" comment="" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" /> <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
...@@ -68,23 +48,30 @@ ...@@ -68,23 +48,30 @@
</component> </component>
<component name="ProjectViewState"> <component name="ProjectViewState">
<option name="hideEmptyMiddlePackages" value="true" /> <option name="hideEmptyMiddlePackages" value="true" />
<option name="showExcludedFiles" value="true" />
<option name="showLibraryContents" value="true" /> <option name="showLibraryContents" value="true" />
</component> </component>
<component name="PropertiesComponent"> <component name="PropertiesComponent">
<property name="ASKED_ADD_EXTERNAL_FILES" value="true" /> <property name="ASKED_ADD_EXTERNAL_FILES" value="true" />
<property name="DatabaseDriversLRU" value="hive" /> <property name="DatabaseDriversLRU" value="hive" />
<property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
<property name="RunOnceActivity.ShowReadmeOnStart" value="true" /> <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
<property name="WebServerToolWindowFactoryState" value="false" /> <property name="WebServerToolWindowFactoryState" value="false" />
<property name="aspect.path.notification.shown" value="true" /> <property name="aspect.path.notification.shown" value="true" />
<property name="ignore_missing_gitignore" value="true" /> <property name="ignore_missing_gitignore" value="true" />
<property name="last_opened_file_path" value="$PROJECT_DIR$" /> <property name="last_opened_file_path" value="$PROJECT_DIR$/bin" />
<property name="project.structure.last.edited" value="Global Libraries" /> <property name="project.structure.last.edited" value="Global Libraries" />
<property name="project.structure.proportion" value="0.0" /> <property name="project.structure.proportion" value="0.0" />
<property name="project.structure.side.proportion" value="0.2" /> <property name="project.structure.side.proportion" value="0.2" />
<property name="settings.editor.selected.configurable" value="File.Encoding" /> <property name="settings.editor.selected.configurable" value="File.Encoding" />
</component> </component>
<component name="RecentsManager"> <component name="RecentsManager">
<key name="CopyFile.RECENT_KEYS">
<recent name="$PROJECT_DIR$/bin" />
<recent name="$PROJECT_DIR$/jobs/demo_java_gen" />
<recent name="$PROJECT_DIR$/jobs" />
<recent name="$PROJECT_DIR$/jobs/hive_insert" />
<recent name="$PROJECT_DIR$/sqls" />
</key>
<key name="MoveFile.RECENT_KEYS"> <key name="MoveFile.RECENT_KEYS">
<recent name="$PROJECT_DIR$/jobs/bak" /> <recent name="$PROJECT_DIR$/jobs/bak" />
<recent name="$PROJECT_DIR$/sqls/bak" /> <recent name="$PROJECT_DIR$/sqls/bak" />
...@@ -92,13 +79,6 @@ ...@@ -92,13 +79,6 @@
<recent name="$PROJECT_DIR$/sqls/demo" /> <recent name="$PROJECT_DIR$/sqls/demo" />
<recent name="$PROJECT_DIR$/lib/java" /> <recent name="$PROJECT_DIR$/lib/java" />
</key> </key>
<key name="CopyFile.RECENT_KEYS">
<recent name="$PROJECT_DIR$/jobs/demo_java_gen" />
<recent name="$PROJECT_DIR$/jobs" />
<recent name="$PROJECT_DIR$/jobs/hive_insert" />
<recent name="$PROJECT_DIR$/sqls" />
<recent name="$PROJECT_DIR$/jobs/meigou-detail-page" />
</key>
</component> </component>
<component name="RunManager"> <component name="RunManager">
<configuration default="true" type="ClojureREPL" factoryName="Local" activateToolWindowBeforeRun="false"> <configuration default="true" type="ClojureREPL" factoryName="Local" activateToolWindowBeforeRun="false">
...@@ -145,6 +125,8 @@ ...@@ -145,6 +125,8 @@
<workItem from="1588248522289" duration="2820000" /> <workItem from="1588248522289" duration="2820000" />
<workItem from="1588344251422" duration="21636000" /> <workItem from="1588344251422" duration="21636000" />
<workItem from="1588761853482" duration="3826000" /> <workItem from="1588761853482" duration="3826000" />
<workItem from="1588905392183" duration="4522000" />
<workItem from="1589447155495" duration="14053000" />
</task> </task>
<task id="LOCAL-00001" summary="add init codes."> <task id="LOCAL-00001" summary="add init codes.">
<created>1587723565207</created> <created>1587723565207</created>
...@@ -300,7 +282,42 @@ ...@@ -300,7 +282,42 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1588522705925</updated> <updated>1588522705925</updated>
</task> </task>
<option name="localTasksCounter" value="23" /> <task id="LOCAL-00023" summary="update codes">
<created>1589531180950</created>
<option name="number" value="00023" />
<option name="presentableId" value="LOCAL-00023" />
<option name="project" value="LOCAL" />
<updated>1589531180950</updated>
</task>
<task id="LOCAL-00024" summary="update codes">
<created>1589531276027</created>
<option name="number" value="00024" />
<option name="presentableId" value="LOCAL-00024" />
<option name="project" value="LOCAL" />
<updated>1589531276027</updated>
</task>
<task id="LOCAL-00025" summary="update codes">
<created>1589531399499</created>
<option name="number" value="00025" />
<option name="presentableId" value="LOCAL-00025" />
<option name="project" value="LOCAL" />
<updated>1589531399499</updated>
</task>
<task id="LOCAL-00026" summary="update codes">
<created>1589534027533</created>
<option name="number" value="00026" />
<option name="presentableId" value="LOCAL-00026" />
<option name="project" value="LOCAL" />
<updated>1589534027533</updated>
</task>
<task id="LOCAL-00027" summary="update codes">
<created>1589536751237</created>
<option name="number" value="00027" />
<option name="presentableId" value="LOCAL-00027" />
<option name="project" value="LOCAL" />
<updated>1589536751237</updated>
</task>
<option name="localTasksCounter" value="28" />
<servers /> <servers />
</component> </component>
<component name="TypeScriptGeneratedFilesManager"> <component name="TypeScriptGeneratedFilesManager">
...@@ -334,19 +351,13 @@ ...@@ -334,19 +351,13 @@
</State> </State>
</value> </value>
</entry> </entry>
<entry key="MAIN">
<value>
<State />
</value>
</entry>
</map> </map>
</option> </option>
<option name="OPEN_GENERIC_TABS"> <option name="OPEN_TABS">
<map> <set>
<entry key="1" value="TOOL_WINDOW" /> <option value="1" />
</map> </set>
</option> </option>
<option name="oldMeFiltersMigrated" value="true" />
</component> </component>
<component name="VcsManagerConfiguration"> <component name="VcsManagerConfiguration">
<option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" /> <option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
...@@ -372,10 +383,11 @@ ...@@ -372,10 +383,11 @@
<screen x="246" y="1080" width="1920" height="1151" /> <screen x="246" y="1080" width="1920" height="1151" />
</state> </state>
<state x="826" y="1351" key="#com.intellij.ide.util.frameworkSupport.AddFrameworkSupportDialog/246.1080.1920.1151/0.22.1920.1058@246.1080.1920.1151" timestamp="1587720303076" /> <state x="826" y="1351" key="#com.intellij.ide.util.frameworkSupport.AddFrameworkSupportDialog/246.1080.1920.1151/0.22.1920.1058@246.1080.1920.1151" timestamp="1587720303076" />
<state x="554" y="197" key="CommitChangelistDialog2" timestamp="1588522705736"> <state x="554" y="205" key="CommitChangelistDialog2" timestamp="1589536751036">
<screen x="0" y="22" width="1920" height="1129" /> <screen x="0" y="22" width="1920" height="1178" />
</state> </state>
<state x="554" y="197" key="CommitChangelistDialog2/0.22.1920.1129@0.22.1920.1129" timestamp="1588522705736" /> <state x="554" y="197" key="CommitChangelistDialog2/0.22.1920.1129@0.22.1920.1129" timestamp="1588522705736" />
<state x="554" y="205" key="CommitChangelistDialog2/1752.1200.1920.1151/0.22.1920.1178/1920.120.1920.1080@0.22.1920.1178" timestamp="1589536751036" />
<state x="554" y="186" key="CommitChangelistDialog2/246.1080.1920.1151/0.22.1920.1058@0.22.1920.1058" timestamp="1588232534973" /> <state x="554" y="186" key="CommitChangelistDialog2/246.1080.1920.1151/0.22.1920.1058@0.22.1920.1058" timestamp="1588232534973" />
<state x="800" y="1258" key="CommitChangelistDialog2/246.1080.1920.1151/0.22.1920.1058@246.1080.1920.1151" timestamp="1587900238196" /> <state x="800" y="1258" key="CommitChangelistDialog2/246.1080.1920.1151/0.22.1920.1058@246.1080.1920.1151" timestamp="1587900238196" />
<state x="792" y="309" key="RollbackChangesDialog" timestamp="1588521468770"> <state x="792" y="309" key="RollbackChangesDialog" timestamp="1588521468770">
...@@ -388,12 +400,17 @@ ...@@ -388,12 +400,17 @@
</state> </state>
<state x="448" y="176" key="SettingsEditor/0.22.1920.1129@0.22.1920.1129" timestamp="1588346857662" /> <state x="448" y="176" key="SettingsEditor/0.22.1920.1129@0.22.1920.1129" timestamp="1588346857662" />
<state x="694" y="1237" key="SettingsEditor/246.1080.1920.1151/0.22.1920.1058@246.1080.1920.1151" timestamp="1587720319782" /> <state x="694" y="1237" key="SettingsEditor/246.1080.1920.1151/0.22.1920.1058@246.1080.1920.1151" timestamp="1587720319782" />
<state x="560" y="331" key="Vcs.Push.Dialog.v2" timestamp="1588522707302"> <state x="560" y="344" key="Vcs.Push.Dialog.v2" timestamp="1589536752839">
<screen x="0" y="22" width="1920" height="1129" /> <screen x="0" y="22" width="1920" height="1178" />
</state> </state>
<state x="560" y="331" key="Vcs.Push.Dialog.v2/0.22.1920.1129@0.22.1920.1129" timestamp="1588522707302" /> <state x="560" y="331" key="Vcs.Push.Dialog.v2/0.22.1920.1129@0.22.1920.1129" timestamp="1588522707302" />
<state x="560" y="344" key="Vcs.Push.Dialog.v2/1752.1200.1920.1151/0.22.1920.1178/1920.120.1920.1080@0.22.1920.1178" timestamp="1589536752839" />
<state x="560" y="312" key="Vcs.Push.Dialog.v2/246.1080.1920.1151/0.22.1920.1058@0.22.1920.1058" timestamp="1588232541898" /> <state x="560" y="312" key="Vcs.Push.Dialog.v2/246.1080.1920.1151/0.22.1920.1058@0.22.1920.1058" timestamp="1588232541898" />
<state x="806" y="1395" key="Vcs.Push.Dialog.v2/246.1080.1920.1151/0.22.1920.1058@246.1080.1920.1151" timestamp="1587900239771" /> <state x="806" y="1395" key="Vcs.Push.Dialog.v2/246.1080.1920.1151/0.22.1920.1058@246.1080.1920.1151" timestamp="1587900239771" />
<state x="625" y="409" key="git4idea.merge.GitPullDialog" timestamp="1589534639344">
<screen x="0" y="22" width="1920" height="1178" />
</state>
<state x="625" y="409" key="git4idea.merge.GitPullDialog/1752.1200.1920.1151/0.22.1920.1178/1920.120.1920.1080@0.22.1920.1178" timestamp="1589534639344" />
<state x="578" y="257" key="search.everywhere.popup" timestamp="1588231057499"> <state x="578" y="257" key="search.everywhere.popup" timestamp="1588231057499">
<screen x="0" y="22" width="1920" height="1058" /> <screen x="0" y="22" width="1920" height="1058" />
</state> </state>
......
bin/pull_wym.sh 0 → 100755
View file @ e5d2ae02
#!/bin/bash
set -e
set -x
git checkout weiyimin
git pull origin weiyimin
\ No newline at end of file
conf/en-cn.properties
View file @ e5d2ae02
...@@ -2,6 +2,7 @@ demo=示例程序-demo ...@@ -2,6 +2,7 @@ demo=示例程序-demo
demo_bak=示例程序-demo_bak demo_bak=示例程序-demo_bak
demo_param=带参数的示例程序 demo_param=带参数的示例程序
demo_java=JAVA实例程序 demo_java=JAVA实例程序
meigou-detail-page=美购详情页 meigou-detail-page=美购详情页
meigou-detail-page-dispense-pv=美购详情页分发pv meigou-detail-page-dispense-pv=美购详情页分发pv
meigou-detail-page-dispense-uv=美购详情页分发uv meigou-detail-page-dispense-uv=美购详情页分发uv
......
lib/java/bi-report-service/.idea/workspace.xml
View file @ e5d2ae02
...@@ -85,7 +85,7 @@ ...@@ -85,7 +85,7 @@
<command value="mvn clean" /> <command value="mvn clean" />
</option> </option>
</component> </component>
<component name="RunManager" selected="Application.DateUtils"> <component name="RunManager" selected="JUnit.EmailServiceTest.testSendFormattedMail">
<configuration name="DateUtils" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true"> <configuration name="DateUtils" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
<option name="MAIN_CLASS_NAME" value="com.gmei.data.gateway.server.utils.DateUtils" /> <option name="MAIN_CLASS_NAME" value="com.gmei.data.gateway.server.utils.DateUtils" />
<module name="service-server" /> <module name="service-server" />
...@@ -118,7 +118,7 @@ ...@@ -118,7 +118,7 @@
<setting name="fixLineNumbers" value="false" /> <setting name="fixLineNumbers" value="false" />
<method v="2" /> <method v="2" />
</configuration> </configuration>
<configuration name="BiReportServiceTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true"> <configuration name="EmailServiceTest.testSendFormattedMail" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
<module name="service-server" /> <module name="service-server" />
<extension name="coverage"> <extension name="coverage">
<pattern> <pattern>
...@@ -127,8 +127,9 @@ ...@@ -127,8 +127,9 @@
</pattern> </pattern>
</extension> </extension>
<option name="PACKAGE_NAME" value="com.gmei.data.gateway.server.service" /> <option name="PACKAGE_NAME" value="com.gmei.data.gateway.server.service" />
<option name="MAIN_CLASS_NAME" value="com.gmei.data.gateway.server.service.BiReportServiceTest" /> <option name="MAIN_CLASS_NAME" value="com.gmei.data.gateway.server.service.EmailServiceTest" />
<option name="TEST_OBJECT" value="class" /> <option name="METHOD_NAME" value="testSendFormattedMail" />
<option name="TEST_OBJECT" value="method" />
<method v="2"> <method v="2">
<option name="Make" enabled="true" /> <option name="Make" enabled="true" />
</method> </method>
...@@ -189,11 +190,11 @@ ...@@ -189,11 +190,11 @@
</configuration> </configuration>
<recent_temporary> <recent_temporary>
<list> <list>
<item itemvalue="JUnit.EmailServiceTest.testSendFormattedMail" />
<item itemvalue="Application.DateUtils" /> <item itemvalue="Application.DateUtils" />
<item itemvalue="JUnit.SparksqlServiceTest" /> <item itemvalue="JUnit.SparksqlServiceTest" />
<item itemvalue="JUnit.SparksqlServiceTest.testGenExcel" /> <item itemvalue="JUnit.SparksqlServiceTest.testGenExcel" />
<item itemvalue="JUnit.ExcelServiceTest.testGenExcel" /> <item itemvalue="JUnit.ExcelServiceTest.testGenExcel" />
<item itemvalue="JUnit.BiReportServiceTest" />
</list> </list>
</recent_temporary> </recent_temporary>
</component> </component>
...@@ -217,6 +218,7 @@ ...@@ -217,6 +218,7 @@
<workItem from="1588344252163" duration="15923000" /> <workItem from="1588344252163" duration="15923000" />
<workItem from="1588762492573" duration="403000" /> <workItem from="1588762492573" duration="403000" />
<workItem from="1588837331043" duration="673000" /> <workItem from="1588837331043" duration="673000" />
<workItem from="1589455301393" duration="9516000" />
</task> </task>
<servers /> <servers />
</component> </component>
...@@ -286,54 +288,67 @@ ...@@ -286,54 +288,67 @@
</state> </state>
<state x="553" y="153" key="CommitChangelistDialog2/246.1080.1920.1151/0.22.1920.1058@0.22.1920.1058" timestamp="1584956237641" /> <state x="553" y="153" key="CommitChangelistDialog2/246.1080.1920.1151/0.22.1920.1058@0.22.1920.1058" timestamp="1584956237641" />
<state x="784" y="1223" key="CommitChangelistDialog2/246.1080.1920.1151/0.22.1920.1058@246.1080.1920.1151" timestamp="1588154132365" /> <state x="784" y="1223" key="CommitChangelistDialog2/246.1080.1920.1151/0.22.1920.1058@246.1080.1920.1151" timestamp="1588154132365" />
<state width="1878" height="243" key="GridCell.Tab.0.bottom" timestamp="1588838004638"> <state width="1878" height="243" key="GridCell.Tab.0.bottom" timestamp="1589943908805">
<screen x="246" y="1080" width="1920" height="1151" /> <screen x="1752" y="1200" width="1920" height="1151" />
</state> </state>
<state width="1878" height="243" key="GridCell.Tab.0.bottom/0.22.1920.1129@0.22.1920.1129" timestamp="1588761074648" /> <state width="1878" height="243" key="GridCell.Tab.0.bottom/0.22.1920.1129@0.22.1920.1129" timestamp="1588761074648" />
<state width="1878" height="243" key="GridCell.Tab.0.bottom/1752.1200.1920.1151/0.22.1920.1178/1920.120.1920.1080@1752.1200.1920.1151" timestamp="1589943908805" />
<state width="1878" height="321" key="GridCell.Tab.0.bottom/246.1080.1920.1151/0.22.1920.1058@0.22.1920.1058" timestamp="1584688137007" /> <state width="1878" height="321" key="GridCell.Tab.0.bottom/246.1080.1920.1151/0.22.1920.1058@0.22.1920.1058" timestamp="1584688137007" />
<state width="1878" height="243" key="GridCell.Tab.0.bottom/246.1080.1920.1151/0.22.1920.1058@246.1080.1920.1151" timestamp="1588838004638" /> <state width="1878" height="243" key="GridCell.Tab.0.bottom/246.1080.1920.1151/0.22.1920.1058@246.1080.1920.1151" timestamp="1588838004638" />
<state width="1878" height="243" key="GridCell.Tab.0.center" timestamp="1588838004637"> <state width="1878" height="243" key="GridCell.Tab.0.center" timestamp="1589943908804">
<screen x="246" y="1080" width="1920" height="1151" /> <screen x="1752" y="1200" width="1920" height="1151" />
</state> </state>
<state width="1878" height="243" key="GridCell.Tab.0.center/0.22.1920.1129@0.22.1920.1129" timestamp="1588761074647" /> <state width="1878" height="243" key="GridCell.Tab.0.center/0.22.1920.1129@0.22.1920.1129" timestamp="1588761074647" />
<state width="1878" height="243" key="GridCell.Tab.0.center/1752.1200.1920.1151/0.22.1920.1178/1920.120.1920.1080@1752.1200.1920.1151" timestamp="1589943908804" />
<state width="1878" height="321" key="GridCell.Tab.0.center/246.1080.1920.1151/0.22.1920.1058@0.22.1920.1058" timestamp="1584688137005" /> <state width="1878" height="321" key="GridCell.Tab.0.center/246.1080.1920.1151/0.22.1920.1058@0.22.1920.1058" timestamp="1584688137005" />
<state width="1878" height="243" key="GridCell.Tab.0.center/246.1080.1920.1151/0.22.1920.1058@246.1080.1920.1151" timestamp="1588838004637" /> <state width="1878" height="243" key="GridCell.Tab.0.center/246.1080.1920.1151/0.22.1920.1058@246.1080.1920.1151" timestamp="1588838004637" />
<state width="1878" height="243" key="GridCell.Tab.0.left" timestamp="1588838004636"> <state width="1878" height="243" key="GridCell.Tab.0.left" timestamp="1589943908803">
<screen x="246" y="1080" width="1920" height="1151" /> <screen x="1752" y="1200" width="1920" height="1151" />
</state> </state>
<state width="1878" height="243" key="GridCell.Tab.0.left/0.22.1920.1129@0.22.1920.1129" timestamp="1588761074647" /> <state width="1878" height="243" key="GridCell.Tab.0.left/0.22.1920.1129@0.22.1920.1129" timestamp="1588761074647" />
<state width="1878" height="243" key="GridCell.Tab.0.left/1752.1200.1920.1151/0.22.1920.1178/1920.120.1920.1080@1752.1200.1920.1151" timestamp="1589943908803" />
<state width="1878" height="321" key="GridCell.Tab.0.left/246.1080.1920.1151/0.22.1920.1058@0.22.1920.1058" timestamp="1584688137005" /> <state width="1878" height="321" key="GridCell.Tab.0.left/246.1080.1920.1151/0.22.1920.1058@0.22.1920.1058" timestamp="1584688137005" />
<state width="1878" height="243" key="GridCell.Tab.0.left/246.1080.1920.1151/0.22.1920.1058@246.1080.1920.1151" timestamp="1588838004636" /> <state width="1878" height="243" key="GridCell.Tab.0.left/246.1080.1920.1151/0.22.1920.1058@246.1080.1920.1151" timestamp="1588838004636" />
<state width="1878" height="243" key="GridCell.Tab.0.right" timestamp="1588838004637"> <state width="1878" height="243" key="GridCell.Tab.0.right" timestamp="1589943908805">
<screen x="246" y="1080" width="1920" height="1151" /> <screen x="1752" y="1200" width="1920" height="1151" />
</state> </state>
<state width="1878" height="243" key="GridCell.Tab.0.right/0.22.1920.1129@0.22.1920.1129" timestamp="1588761074648" /> <state width="1878" height="243" key="GridCell.Tab.0.right/0.22.1920.1129@0.22.1920.1129" timestamp="1588761074648" />
<state width="1878" height="243" key="GridCell.Tab.0.right/1752.1200.1920.1151/0.22.1920.1178/1920.120.1920.1080@1752.1200.1920.1151" timestamp="1589943908805" />
<state width="1878" height="321" key="GridCell.Tab.0.right/246.1080.1920.1151/0.22.1920.1058@0.22.1920.1058" timestamp="1584688137006" /> <state width="1878" height="321" key="GridCell.Tab.0.right/246.1080.1920.1151/0.22.1920.1058@0.22.1920.1058" timestamp="1584688137006" />
<state width="1878" height="243" key="GridCell.Tab.0.right/246.1080.1920.1151/0.22.1920.1058@246.1080.1920.1151" timestamp="1588838004637" /> <state width="1878" height="243" key="GridCell.Tab.0.right/246.1080.1920.1151/0.22.1920.1058@246.1080.1920.1151" timestamp="1588838004637" />
<state width="1878" height="319" key="GridCell.Tab.1.bottom" timestamp="1588216559611"> <state width="1878" height="395" key="GridCell.Tab.1.bottom" timestamp="1589536486433">
<screen x="246" y="1080" width="1920" height="1151" /> <screen x="1752" y="1200" width="1920" height="1151" />
</state> </state>
<state width="1878" height="395" key="GridCell.Tab.1.bottom/1752.1200.1920.1151/0.22.1920.1178/1920.120.1920.1080@1752.1200.1920.1151" timestamp="1589536486433" />
<state width="1878" height="319" key="GridCell.Tab.1.bottom/246.1080.1920.1151/0.22.1920.1058@246.1080.1920.1151" timestamp="1588216559611" /> <state width="1878" height="319" key="GridCell.Tab.1.bottom/246.1080.1920.1151/0.22.1920.1058@246.1080.1920.1151" timestamp="1588216559611" />
<state width="1878" height="319" key="GridCell.Tab.1.center" timestamp="1588216559609"> <state width="1878" height="395" key="GridCell.Tab.1.center" timestamp="1589536486431">
<screen x="246" y="1080" width="1920" height="1151" /> <screen x="1752" y="1200" width="1920" height="1151" />
</state> </state>
<state width="1878" height="395" key="GridCell.Tab.1.center/1752.1200.1920.1151/0.22.1920.1178/1920.120.1920.1080@1752.1200.1920.1151" timestamp="1589536486431" />
<state width="1878" height="319" key="GridCell.Tab.1.center/246.1080.1920.1151/0.22.1920.1058@246.1080.1920.1151" timestamp="1588216559609" /> <state width="1878" height="319" key="GridCell.Tab.1.center/246.1080.1920.1151/0.22.1920.1058@246.1080.1920.1151" timestamp="1588216559609" />
<state width="1878" height="319" key="GridCell.Tab.1.left" timestamp="1588216559609"> <state width="1878" height="395" key="GridCell.Tab.1.left" timestamp="1589536486430">
<screen x="246" y="1080" width="1920" height="1151" /> <screen x="1752" y="1200" width="1920" height="1151" />
</state> </state>
<state width="1878" height="395" key="GridCell.Tab.1.left/1752.1200.1920.1151/0.22.1920.1178/1920.120.1920.1080@1752.1200.1920.1151" timestamp="1589536486430" />
<state width="1878" height="319" key="GridCell.Tab.1.left/246.1080.1920.1151/0.22.1920.1058@246.1080.1920.1151" timestamp="1588216559609" /> <state width="1878" height="319" key="GridCell.Tab.1.left/246.1080.1920.1151/0.22.1920.1058@246.1080.1920.1151" timestamp="1588216559609" />
<state width="1878" height="319" key="GridCell.Tab.1.right" timestamp="1588216559611"> <state width="1878" height="395" key="GridCell.Tab.1.right" timestamp="1589536486432">
<screen x="246" y="1080" width="1920" height="1151" /> <screen x="1752" y="1200" width="1920" height="1151" />
</state> </state>
<state width="1878" height="395" key="GridCell.Tab.1.right/1752.1200.1920.1151/0.22.1920.1178/1920.120.1920.1080@1752.1200.1920.1151" timestamp="1589536486432" />
<state width="1878" height="319" key="GridCell.Tab.1.right/246.1080.1920.1151/0.22.1920.1058@246.1080.1920.1151" timestamp="1588216559611" /> <state width="1878" height="319" key="GridCell.Tab.1.right/246.1080.1920.1151/0.22.1920.1058@246.1080.1920.1151" timestamp="1588216559611" />
<state x="560" y="291" key="Vcs.Push.Dialog.v2" timestamp="1584949293518"> <state x="560" y="291" key="Vcs.Push.Dialog.v2" timestamp="1584949293518">
<screen x="0" y="22" width="1920" height="1058" /> <screen x="0" y="22" width="1920" height="1058" />
</state> </state>
<state x="560" y="291" key="Vcs.Push.Dialog.v2/246.1080.1920.1151/0.22.1920.1058@0.22.1920.1058" timestamp="1584949293518" /> <state x="560" y="291" key="Vcs.Push.Dialog.v2/246.1080.1920.1151/0.22.1920.1058@0.22.1920.1058" timestamp="1584949293518" />
<state x="715" y="1270" width="670" height="675" key="run.anything.popup" timestamp="1588837938694"> <state x="2221" y="1390" width="670" height="675" key="run.anything.popup" timestamp="1589943863616">
<screen x="246" y="1080" width="1920" height="1151" /> <screen x="1752" y="1200" width="1920" height="1151" />
</state> </state>
<state x="469" y="208" width="670" height="663" key="run.anything.popup/0.22.1920.1129@0.22.1920.1129" timestamp="1588345465540" /> <state x="469" y="208" width="670" height="663" key="run.anything.popup/0.22.1920.1129@0.22.1920.1129" timestamp="1588345465540" />
<state x="2221" y="1390" width="670" height="675" key="run.anything.popup/1752.1200.1920.1151/0.22.1920.1178/1920.120.1920.1080@1752.1200.1920.1151" timestamp="1589943863616" />
<state x="715" y="1270" width="670" height="675" key="run.anything.popup/246.1080.1920.1151/0.22.1920.1058@246.1080.1920.1151" timestamp="1588837938694" /> <state x="715" y="1270" width="670" height="675" key="run.anything.popup/246.1080.1920.1151/0.22.1920.1058@246.1080.1920.1151" timestamp="1588837938694" />
<state x="2330" y="1458" width="764" height="676" key="search.everywhere.popup" timestamp="1589943432014">
<screen x="1752" y="1200" width="1920" height="1151" />
</state>
<state x="2330" y="1458" width="764" height="676" key="search.everywhere.popup/1752.1200.1920.1151/0.22.1920.1178/1920.120.1920.1080@1752.1200.1920.1151" timestamp="1589943432014" />
</component> </component>
</project> </project>
\ No newline at end of file
lib/java/bi-report-service/service-server/src/main/java/com/gmei/data/gateway/server/service/EmailService.java
View file @ e5d2ae02
package com.gmei.data.gateway.server.service; package com.gmei.data.gateway.server.service;
public interface EmailService { public interface EmailService {
int sendAttachmentsMail(String to,String cc,String subject); int sendAttachmentsMail(String to,String cc,String name);
int sendFormatedMail(String to,String cc,String name,String content);
} }
lib/java/bi-report-service/service-server/src/main/java/com/gmei/data/gateway/server/service/impl/BiReportServiceImpl.java
View file @ e5d2ae02
...@@ -43,10 +43,14 @@ public class BiReportServiceImpl implements BiReportService { ...@@ -43,10 +43,14 @@ public class BiReportServiceImpl implements BiReportService {
public int sendEmail(String to,String cc,String name){ public int sendEmail(String to,String cc,String name){
int rs = Constants.SUCCESS; int rs = Constants.SUCCESS;
ExcelGenDto resultDto = sparksqlService.getResultDto(name); ExcelGenDto resultDto = sparksqlService.getResultDto(name);
if(null == resultDto){
rs = Constants.FAIL;
}else{
int genExcelRs = excelService.genExcel(resultDto,name); int genExcelRs = excelService.genExcel(resultDto,name);
if(Constants.SUCCESS == genExcelRs){ if(Constants.SUCCESS == genExcelRs){
rs = emailService.sendAttachmentsMail(to,cc,name); rs = emailService.sendAttachmentsMail(to,cc,name);
} }
}
return rs; return rs;
} }
} }
lib/java/bi-report-service/service-server/src/main/java/com/gmei/data/gateway/server/service/impl/EmailServiceImpl.java
View file @ e5d2ae02
...@@ -75,4 +75,41 @@ public class EmailServiceImpl implements EmailService { ...@@ -75,4 +75,41 @@ public class EmailServiceImpl implements EmailService {
} }
return rs; return rs;
} }
@Override
public int sendFormatedMail(String to,String cc,String name, String htmlContent){
int rs = Constants.SUCCESS;
// 主题内容转义
String subject = "";
String value = ProperUtils.getValue(properFilePath, name);
if(null != value){
subject = value;
}else{
subject = name;
}
// 邮件发送逻辑
MimeMessage message = mailSender.createMimeMessage();
try {
MimeMessageHelper helper = new MimeMessageHelper(message, true,"UTF-8");
helper.setFrom(from);
String[] toUsers = to.split(",");
helper.setTo(toUsers);
helper.setSubject(subject);
helper.setText(htmlContent, true);
if (cc != null && !"".equals(cc.trim())) {
String[] ccUsers = cc.split(",");
helper.setCc(ccUsers);
}
if (bcc != null && !"".equals(bcc.trim())) {
String[] bccUsers = bcc.split(",");
helper.setBcc(bccUsers);
}
mailSender.send(message);
logger.info("格式化的邮件已经发送。");
} catch (Exception e) {
logger.error("格式化后的邮件发送异常！", e);
rs = Constants.FAIL;
}
return rs;
}
} }
lib/java/bi-report-service/service-server/src/main/java/com/gmei/data/gateway/server/service/impl/ExcelServiceImpl.java
View file @ e5d2ae02
...@@ -45,6 +45,7 @@ public class ExcelServiceImpl implements ExcelService { ...@@ -45,6 +45,7 @@ public class ExcelServiceImpl implements ExcelService {
@Override @Override
public int genExcel(ExcelGenDto excelGenDto, String name) { public int genExcel(ExcelGenDto excelGenDto, String name) {
int rs = Constants.SUCCESS; int rs = Constants.SUCCESS;
try {
List<String> sheetNameList = excelGenDto.getSheetNameList(); List<String> sheetNameList = excelGenDto.getSheetNameList();
List<List<String>> headersList = excelGenDto.getHeadersList(); List<List<String>> headersList = excelGenDto.getHeadersList();
List<List<List>> rowsList = excelGenDto.getRowsList(); List<List<List>> rowsList = excelGenDto.getRowsList();
...@@ -60,14 +61,13 @@ public class ExcelServiceImpl implements ExcelService { ...@@ -60,14 +61,13 @@ public class ExcelServiceImpl implements ExcelService {
rs = Constants.FAIL; rs = Constants.FAIL;
logger.error("Error!"); logger.error("Error!");
} }
// String subject = ""; // String subject = "";
// String value = ProperUtils.getValue(properFilePath, name); // String value = ProperUtils.getValue(properFilePath, name);
// if(null != value){ // if(null != value){
// subject = value; // subject = value;
// }else{ // }else{
// subject = name; // subject = name;
// } // }
try {
FileOutputStream out = new FileOutputStream(filePath + name + "-" + DateUtils.getYesterdayDateSimpleStr() + ".xlsx"); FileOutputStream out = new FileOutputStream(filePath + name + "-" + DateUtils.getYesterdayDateSimpleStr() + ".xlsx");
wb.write(out); wb.write(out);
out.close(); out.close();
......
lib/java/bi-report-service/service-server/src/main/resources/application.yml
View file @ e5d2ae02
...@@ -40,3 +40,4 @@ logging: ...@@ -40,3 +40,4 @@ logging:
proper: proper:
file: file:
path: /home/bi/bi-report/conf/en-cn.properties path: /home/bi/bi-report/conf/en-cn.properties
#path: /Users/apple/git-repo/bi-report/conf/en-cn.properties
\ No newline at end of file
lib/java/bi-report-service/service-server/src/test/html/demo.html 0 → 100644
View file @ e5d2ae02
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<h1 style="text-align:center;">北极星监控预警信息</h1>
<h2 style="color:red;">北极星监控预警</h2>
<h3>北极星监控预警</h3>
<h4>北极星监控预警</h4>
<h5>北极星监控预警</h5>
<h6>北极星监控预警</h6>
\ No newline at end of file
lib/java/bi-report-service/service-server/src/test/java/com/gmei/data/gateway/server/service/EmailServiceTest.java
View file @ e5d2ae02
...@@ -21,6 +21,12 @@ public class EmailServiceTest { ...@@ -21,6 +21,12 @@ public class EmailServiceTest {
@Test @Test
public void testSendAttachmentsMail() { public void testSendAttachmentsMail() {
emailService.sendAttachmentsMail("zhaojianwei@igengmei.com","jianweizhao@yeah.net","敏感稽查元数据库账户"); emailService.sendAttachmentsMail("zhaojianwei@igengmei.com","jianweizhao@yeah.net","demo");
}
@Test
public void testSendFormattedMail() {
String htmlContent = "<h1>demo</h1>";
emailService.sendFormatedMail("zhaojianwei@igengmei.com","jianweizhao@yeah.net","demo",htmlContent);
} }
} }
sbin/pull_master.sh 0 → 100755
View file @ e5d2ae02
#!/bin/bash
git chekcout master
git pull origin master
\ No newline at end of file
sbin/pull_wym.sh 0 → 100755
View file @ e5d2ae02
#!/bin/bash
set -e
set -x
git checkout weiyimin
git pull origin weiyimin
\ No newline at end of file
sbin/pull_zjw.sh 0 → 100755
View file @ e5d2ae02
#!/bin/bash
git chekcout zhaojianwei
git pull origin zhaojianwei
\ No newline at end of file
sbin/test.sh deleted 100755 → 0
View file @ d4175ee0
#!/bin/bash
curl -X GET http://localhost:8553/api/report/sendEmail/zhaojianwei@igengmei.com/jianweizhao@yeah.net/demo
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