Skip to content

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

update codes

parent 303ab904
Hide whitespace changes
Inline Side-by-side
Showing with 14 additions and 126 deletions
lib/java/bi-report-service/.idea/workspace.xml
View file @ 49455243
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="73604af3-3cbc-41f8-9a5f-e6a14a2ada76" name="Default Changelist" comment="add"> <list default="true" id="73604af3-3cbc-41f8-9a5f-e6a14a2ada76" name="Default Changelist" comment="add" />
<change beforePath="$PROJECT_DIR$/../../shell/hive2csv.sh" beforeDir="false" afterPath="$PROJECT_DIR$/../../shell/hive2csv.sh" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../../shell/hive2hive.sh" beforeDir="false" afterPath="$PROJECT_DIR$/../../shell/hive2hive.sh" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../../shell/sparksql2email.sh" beforeDir="false" afterPath="$PROJECT_DIR$/../../shell/sparksql2email.sh" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../../../sqls/demo.sql" beforeDir="false" afterPath="$PROJECT_DIR$/../../../sqls/demo/demo.sql" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../../../sqls/demo_param.sql" beforeDir="false" afterPath="$PROJECT_DIR$/../../../sqls/demo_param/demo_param.sql" 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" />
...@@ -85,8 +79,8 @@ ...@@ -85,8 +79,8 @@
</component> </component>
<component name="RunAnythingCache"> <component name="RunAnythingCache">
<option name="myCommands"> <option name="myCommands">
<command value="mvn clean" />
<command value="mvn clean install" /> <command value="mvn clean install" />
<command value="mvn clean" />
</option> </option>
</component> </component>
<component name="RunManager" selected="JUnit.SparksqlServiceTest"> <component name="RunManager" selected="JUnit.SparksqlServiceTest">
...@@ -220,7 +214,7 @@ ...@@ -220,7 +214,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="14219000" /> <workItem from="1588154601852" duration="14561000" />
</task> </task>
<servers /> <servers />
</component> </component>
...@@ -285,26 +279,26 @@ ...@@ -285,26 +279,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="603" key="GridCell.Tab.0.bottom" timestamp="1588230526171"> <state width="1878" height="603" key="GridCell.Tab.0.bottom" timestamp="1588230801725">
<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="603" key="GridCell.Tab.0.bottom/246.1080.1920.1151/0.22.1920.1058@246.1080.1920.1151" timestamp="1588230526171" /> <state width="1878" height="603" key="GridCell.Tab.0.bottom/246.1080.1920.1151/0.22.1920.1058@246.1080.1920.1151" timestamp="1588230801725" />
<state width="1878" height="603" key="GridCell.Tab.0.center" timestamp="1588230526170"> <state width="1878" height="603" key="GridCell.Tab.0.center" timestamp="1588230801724">
<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="603" key="GridCell.Tab.0.center/246.1080.1920.1151/0.22.1920.1058@246.1080.1920.1151" timestamp="1588230526170" /> <state width="1878" height="603" key="GridCell.Tab.0.center/246.1080.1920.1151/0.22.1920.1058@246.1080.1920.1151" timestamp="1588230801724" />
<state width="1878" height="603" key="GridCell.Tab.0.left" timestamp="1588230526169"> <state width="1878" height="603" key="GridCell.Tab.0.left" timestamp="1588230801724">
<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="603" key="GridCell.Tab.0.left/246.1080.1920.1151/0.22.1920.1058@246.1080.1920.1151" timestamp="1588230526169" /> <state width="1878" height="603" key="GridCell.Tab.0.left/246.1080.1920.1151/0.22.1920.1058@246.1080.1920.1151" timestamp="1588230801724" />
<state width="1878" height="603" key="GridCell.Tab.0.right" timestamp="1588230526171"> <state width="1878" height="603" key="GridCell.Tab.0.right" timestamp="1588230801725">
<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="603" key="GridCell.Tab.0.right/246.1080.1920.1151/0.22.1920.1058@246.1080.1920.1151" timestamp="1588230526171" /> <state width="1878" height="603" key="GridCell.Tab.0.right/246.1080.1920.1151/0.22.1920.1058@246.1080.1920.1151" timestamp="1588230801725" />
<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>
...@@ -325,9 +319,9 @@ ...@@ -325,9 +319,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="1588156372328"> <state x="715" y="1270" width="670" height="675" key="run.anything.popup" timestamp="1588230795860">
<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="1588156372328" /> <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="1588230795860" />
</component> </component>
</project> </project>
\ No newline at end of file
lib/java/bi-report-service/service-server/target/classes/application.yml deleted 100644 → 0
View file @ 303ab904
server:
port: 8970
spring:
#---email config---
mail:
host: smtp.exmail.qq.com
username: youjiantongji@wanmeizhensuo.com
password: mq37tgk8nGi6eg1Hgq388oro3itvdmPl
default-encoding: UTF-8
datasource:
sparksql:
jdbcUrl: jdbc:hive2://bj-gm-prod-cos-datacenter003:10010
#---email send config---
mail:
fromMail:
addr: youjiantongji@wanmeizhensuo.com
content: 每日数据报表见附件，请查收。
toMail:
bcc: zhaojianwei@igengmei.com
#---excel config---
excel:
output:
path: /tmp/
#---log config---
logging:
config: classpath:logback.xml
#---shell path config---
shell:
path:
oozie:
start: /srv/apps/gateway/gateway-client/oozie/start-oozie-%s.sh
stop: /srv/apps/gateway/gateway-client/oozie/stop-oozie-%s.sh
lib/java/bi-report-service/service-server/target/classes/banner.txt deleted 100644 → 0
View file @ 303ab904
__ .__
_______ ____ ______ ____________/ |_ ______ ______________ _|__| ____ ____
\_ __ \_/ __ \\____ \ / _ \_ __ \ __\ ______ / ___// __ \_ __ \ \/ / |/ ___\/ __ \
| | \/\ ___/| |_> > <_> ) | \/| | /_____/ \___ \\ ___/| | \/\ /| \ \__\ ___/
|__| \___ > __/ \____/|__| |__| /____ >\___ >__| \_/ |__|\___ >___ >
\/|__| \/ \/ \/ \/
lib/java/bi-report-service/service-server/target/classes/logback.xml deleted 100644 → 0
View file @ 303ab904
<?xml version="1.0" encoding="UTF-8"?>
<configuration debug="false" scan="true" scanPeriod="1 seconds">
<contextName>logback</contextName>
<property name="log.path" value="/data/log/bi-report-service/bi-report-service.log"/>
<appender name="console" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<pattern>%d{HH:mm:ss.SSS} %contextName [%thread] %-5level %logger{36} - %msg%n</pattern>
</encoder>
</appender>
<appender name="file" class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>${log.path}</file>
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<fileNamePattern>${log.path}.%d{yyyy-MM-dd}.zip</fileNamePattern>
</rollingPolicy>
<encoder>
<pattern>%date %level [%thread] %logger{36} [%file : %line] %msg%n
</pattern>
</encoder>
</appender>
<root level="info">
<appender-ref ref="console"/>
<appender-ref ref="file"/>
</root>
</configuration>
\ No newline at end of file
lib/java/bi-report-service/service-server/target/maven-archiver/pom.properties deleted 100644 → 0
View file @ 303ab904
#Generated by Maven
#Wed Apr 29 18:33:01 CST 2020
version=1.0.0-SNAPSHOT
groupId=com.gmei.data
artifactId=service-server
lib/java/bi-report-service/service-server/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst deleted 100644 → 0
View file @ 303ab904
com/gmei/data/gateway/server/GatewayServerApplication.class
com/gmei/data/gateway/server/utils/DateUtils.class
com/gmei/data/gateway/server/vo/RequestVo.class
com/gmei/data/gateway/server/service/impl/ExcelServiceImpl.class
com/gmei/data/gateway/server/common/Constants.class
com/gmei/data/gateway/server/service/impl/MailServiceImpl.class
com/gmei/data/gateway/server/service/MailService.class
com/gmei/data/gateway/server/service/OozieService.class
com/gmei/data/gateway/server/service/ExcelService.class
com/gmei/data/gateway/server/vo/BaseVo.class
com/gmei/data/gateway/server/service/impl/OozieServiceImpl.class
com/gmei/data/gateway/server/controller/OozieController.class
lib/java/bi-report-service/service-server/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst deleted 100644 → 0
View file @ 303ab904
/Users/apple/git-repo/bi-report/lib/java/bi-report-service/service-server/src/main/java/com/gmei/data/gateway/server/vo/RequestVo.java
/Users/apple/git-repo/bi-report/lib/java/bi-report-service/service-server/src/main/java/com/gmei/data/gateway/server/vo/BaseVo.java
/Users/apple/git-repo/bi-report/lib/java/bi-report-service/service-server/src/main/java/com/gmei/data/gateway/server/service/impl/OozieServiceImpl.java
/Users/apple/git-repo/bi-report/lib/java/bi-report-service/service-server/src/main/java/com/gmei/data/gateway/server/common/Constants.java
/Users/apple/git-repo/bi-report/lib/java/bi-report-service/service-server/src/main/java/com/gmei/data/gateway/server/service/impl/MailServiceImpl.java
/Users/apple/git-repo/bi-report/lib/java/bi-report-service/service-server/src/main/java/com/gmei/data/gateway/server/utils/DateUtils.java
/Users/apple/git-repo/bi-report/lib/java/bi-report-service/service-server/src/main/java/com/gmei/data/gateway/server/GatewayServerApplication.java
/Users/apple/git-repo/bi-report/lib/java/bi-report-service/service-server/src/main/java/com/gmei/data/gateway/server/service/ExcelService.java
/Users/apple/git-repo/bi-report/lib/java/bi-report-service/service-server/src/main/java/com/gmei/data/gateway/server/service/impl/ExcelServiceImpl.java
/Users/apple/git-repo/bi-report/lib/java/bi-report-service/service-server/src/main/java/com/gmei/data/gateway/server/service/MailService.java
/Users/apple/git-repo/bi-report/lib/java/bi-report-service/service-server/src/main/java/com/gmei/data/gateway/server/service/OozieService.java
/Users/apple/git-repo/bi-report/lib/java/bi-report-service/service-server/src/main/java/com/gmei/data/gateway/server/controller/OozieController.java
lib/java/bi-report-service/service-server/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst deleted 100644 → 0
View file @ 303ab904
/Users/apple/git-repo/bi-report/lib/java/bi-report-service/service-server/src/test/java/com/gmei/data/gateway/server/GatewayApplicationTests.java
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