Skip to content

S
saasio
Commit 32dd1ad7 by yangfangfang
Options

Merge branch 'master' of git.minrow.com:reyun/saasio

parents ea16bc8b 673355b4
Showing with 69 additions and 14 deletions
pom.xml
......@@ -140,6 +140,61 @@
</profile>
<profile>
<id>split_test</id>
<properties>
<label>dev</label>
<datasource.url>jdbc:mysql://io-split-rds.c42s8pkbxrdg.rds.cn-north-1.amazonaws.com.cn:3306/userio?characterEncoding=utf-8</datasource.url>
<datasource.username>reyun</datasource.username>
<datasource.password>reyun123</datasource.password>
<datasource.driver>com.mysql.jdbc.Driver</datasource.driver>
<!--Redis setting-->
<redis.key.validtime>120</redis.key.validtime>
<redis.ip.requesttimes>5</redis.ip.requesttimes>
<redis.ip.unknown.requesttimes>5</redis.ip.unknown.requesttimes>
<redis.surl.host>io-split-wenqiang.dgfxhr.0001.cnn1.cache.amazonaws.com.cn</redis.surl.host>
<redis.surl.port>6379</redis.surl.port>
<redis.event.host>io-split-wenqiang.dgfxhr.0001.cnn1.cache.amazonaws.com.cn</redis.event.host>
<redis.event.port>6379</redis.event.port>
<redis.event.database>0</redis.event.database>
<!--Redis setting//end-->
<admin.url>http://localhost:8080</admin.url>
<awsneed>false</awsneed>
<report.url>http://localhost:8003/</report.url>
<admin.url>http://localhost:9020</admin.url>
<receiver.host>io-split-receiver-581358642.cn-north-1.elb.amazonaws.com.cn</receiver.host>
<receiver.port>8081</receiver.port>
<mail.host>smtp.exmail.qq.com</mail.host>
<mail.username>manager@reyun.com</mail.username>
<mail.password>Reyun123</mail.password>
<mail.content_type>text/plain;charset\=GBK</mail.content_type>
<mail.list>zhangxiaoyan@reyun.com</mail.list>
<mail.valid_time>4320</mail.valid_time>
<presto.driver>com.facebook.presto.jdbc.PrestoDriver</presto.driver>
<presto.url>jdbc:presto://ec2-54-223-146-236.cn-north-1.compute.amazonaws.com.cn:8889/hive/default</presto.url>
<presto.username>root</presto.username>
<profile.table>kudu.default.profile_</profile.table>
<event.table>tkio_bigtable_view.event_</event.table>
<usergroup.table>tkio_bigtable.tkio_user_group_preview</usergroup.table>
<hive.driver>org.apache.hive.jdbc.HiveDriver</hive.driver>
<hive.url>jdbc:hive2://ec2-54-223-146-236.cn-north-1.compute.amazonaws.com.cn:10000/tkio_bigtable</hive.url>
<hive.username>root</hive.username>
<account.check.url>http://localhost:8091</account.check.url>
</properties>
</profile>
<profile>
<id>aws</id>
<properties>
<label>product</label>
......
saasio.iml
......@@ -32,11 +32,11 @@
<orderEntry type="library" name="Maven: org.springframework:spring-expression:4.3.4.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-context:4.3.4.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-context-support:4.3.4.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.data:spring-data-jpa:1.3.2.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:1.5.1.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-orm:3.1.4.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-jdbc:3.1.4.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.aspectj:aspectjrt:1.7.2" level="project" />
<orderEntry type="library" name="Maven: org.springframework.data:spring-data-jpa:1.10.5.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:1.12.5.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-orm:4.2.8.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-jdbc:4.2.8.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.aspectj:aspectjrt:1.8.9" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-aspects:4.3.4.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.8.9" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-aop:4.3.4.RELEASE" level="project" />
......
src/main/java/com/reyun/model/IONotice.java
......@@ -28,8 +28,8 @@ public class IONotice {
private String deployUserName;
private String deployAccountEmail;
private Long ioAccount;
private Long trackAccount;
private String ioAccount;
private String trackAccount;
private String trackAccountList;
private String ioAccountList;
private Boolean trackAll;
......@@ -157,20 +157,20 @@ public class IONotice {
this.deployAccountEmail = deployAccountEmail;
}
public Long getIoAccount() {
public String getIoAccount() {
return ioAccount;
}
public void setIoAccount(Long ioAccount) {
public void setIoAccount(String ioAccount) {
this.ioAccount = ioAccount;
}
@Transient
public Long getTrackAccount() {
public String getTrackAccount() {
return trackAccount;
}
public void setTrackAccount(Long trackAccount) {
public void setTrackAccount(String trackAccount) {
this.trackAccount = trackAccount;
}
......
src/main/java/com/reyun/repository/NoticeRepository.java
......@@ -13,7 +13,7 @@ import java.util.List;
@Transactional
public interface NoticeRepository extends JpaRepository<IONotice, Long> {
@Query(value = "select * from ionotice n where n.isdeploy is true and (io_account like %?1% or io_account = -1) order by deploy_date desc", nativeQuery = true)
@Query(value = "select * from ionotice n where n.isdeploy is true and (io_account like %?1% or io_account = '-1') order by deploy_date desc", nativeQuery = true)
List<IONotice> listRecentDeployNotice(String email);
......
src/main/resources/applicationContext-schedule.xml
......@@ -9,9 +9,9 @@
<description>调度配置</description>
<bean id="autoCalculateFlow" class="com.reyun.task.AutoCalculateFlow"></bean>
<!--<bean id="autoCalculateFlow" class="com.reyun.task.AutoCalculateFlow"></bean>
<task:scheduled-tasks>
<task:scheduled ref="autoCalculateFlow" method="run" cron="0 */10 * * * ?"/>
</task:scheduled-tasks>
</task:scheduled-tasks>-->
</beans>
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