Skip to content

B
bi-report
Commit 7e35398e authored by 赵建伟's avatar 赵建伟
Browse files
Options

update codes

parent 72e224f1
Hide whitespace changes
Inline Side-by-side
Showing with 30 additions and 11 deletions
lib/java/bi-report-service/.idea/workspace.xml
View file @ 7e35398e
...@@ -215,7 +215,7 @@ ...@@ -215,7 +215,7 @@
<workItem from="1584945647680" duration="4469000" /> <workItem from="1584945647680" duration="4469000" />
<workItem from="1588148891822" duration="2318000" /> <workItem from="1588148891822" duration="2318000" />
<workItem from="1588152718016" duration="1463000" /> <workItem from="1588152718016" duration="1463000" />
<workItem from="1588154601852" duration="20492000" /> <workItem from="1588154601852" duration="20919000" />
</task> </task>
<servers /> <servers />
</component> </component>
...@@ -284,26 +284,26 @@ ...@@ -284,26 +284,26 @@
</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="244" key="GridCell.Tab.0.bottom" timestamp="1588240789163"> <state width="1878" height="244" key="GridCell.Tab.0.bottom" timestamp="1588241253691">
<screen x="246" y="1080" width="1920" height="1151" /> <screen x="246" y="1080" width="1920" height="1151" />
</state> </state>
<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="244" key="GridCell.Tab.0.bottom/246.1080.1920.1151/0.22.1920.1058@246.1080.1920.1151" timestamp="1588240789163" /> <state width="1878" height="244" key="GridCell.Tab.0.bottom/246.1080.1920.1151/0.22.1920.1058@246.1080.1920.1151" timestamp="1588241253691" />
<state width="1878" height="244" key="GridCell.Tab.0.center" timestamp="1588240789162"> <state width="1878" height="244" key="GridCell.Tab.0.center" timestamp="1588241253690">
<screen x="246" y="1080" width="1920" height="1151" /> <screen x="246" y="1080" width="1920" height="1151" />
</state> </state>
<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="244" key="GridCell.Tab.0.center/246.1080.1920.1151/0.22.1920.1058@246.1080.1920.1151" timestamp="1588240789162" /> <state width="1878" height="244" key="GridCell.Tab.0.center/246.1080.1920.1151/0.22.1920.1058@246.1080.1920.1151" timestamp="1588241253690" />
<state width="1878" height="244" key="GridCell.Tab.0.left" timestamp="1588240789161"> <state width="1878" height="244" key="GridCell.Tab.0.left" timestamp="1588241253689">
<screen x="246" y="1080" width="1920" height="1151" /> <screen x="246" y="1080" width="1920" height="1151" />
</state> </state>
<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="244" key="GridCell.Tab.0.left/246.1080.1920.1151/0.22.1920.1058@246.1080.1920.1151" timestamp="1588240789161" /> <state width="1878" height="244" key="GridCell.Tab.0.left/246.1080.1920.1151/0.22.1920.1058@246.1080.1920.1151" timestamp="1588241253689" />
<state width="1878" height="244" key="GridCell.Tab.0.right" timestamp="1588240789163"> <state width="1878" height="244" key="GridCell.Tab.0.right" timestamp="1588241253690">
<screen x="246" y="1080" width="1920" height="1151" /> <screen x="246" y="1080" width="1920" height="1151" />
</state> </state>
<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="244" key="GridCell.Tab.0.right/246.1080.1920.1151/0.22.1920.1058@246.1080.1920.1151" timestamp="1588240789163" /> <state width="1878" height="244" key="GridCell.Tab.0.right/246.1080.1920.1151/0.22.1920.1058@246.1080.1920.1151" timestamp="1588241253690" />
<state width="1878" height="319" key="GridCell.Tab.1.bottom" timestamp="1588216559611"> <state width="1878" height="319" key="GridCell.Tab.1.bottom" timestamp="1588216559611">
<screen x="246" y="1080" width="1920" height="1151" /> <screen x="246" y="1080" width="1920" height="1151" />
</state> </state>
...@@ -324,9 +324,9 @@ ...@@ -324,9 +324,9 @@
<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="1588240789184"> <state x="715" y="1270" width="670" height="675" key="run.anything.popup" timestamp="1588241253713">
<screen x="246" y="1080" width="1920" height="1151" /> <screen x="246" y="1080" width="1920" height="1151" />
</state> </state>
<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="1588240789184" /> <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="1588241253713" />
</component> </component>
</project> </project>
\ No newline at end of file
lib/java/bi-report-service/service-server/pom.xml
View file @ 7e35398e
...@@ -81,6 +81,12 @@ ...@@ -81,6 +81,12 @@
<groupId>org.apache.spark</groupId> <groupId>org.apache.spark</groupId>
<artifactId>spark-sql_${scala.version}</artifactId> <artifactId>spark-sql_${scala.version}</artifactId>
<version>${spark.version}</version> <version>${spark.version}</version>
<exclusions>
<exclusion>
<artifactId>hadoop-mapreduce-client-core</artifactId>
<groupId>org.apache.hadoop</groupId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.spark</groupId> <groupId>org.apache.spark</groupId>
...@@ -101,6 +107,18 @@ ...@@ -101,6 +107,18 @@
<groupId>org.apache.hive</groupId> <groupId>org.apache.hive</groupId>
<artifactId>hive-shims</artifactId> <artifactId>hive-shims</artifactId>
</exclusion> </exclusion>
<exclusion>
<artifactId>hadoop-yarn-api</artifactId>
<groupId>org.apache.hadoop</groupId>
</exclusion>
<exclusion>
<artifactId>hadoop-yarn-common</artifactId>
<groupId>org.apache.hadoop</groupId>
</exclusion>
<exclusion>
<artifactId>hadoop-yarn-server-common</artifactId>
<groupId>org.apache.hadoop</groupId>
</exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
<!-- hadoop依赖 --> <!-- hadoop依赖 -->
......
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