cuihaojie
/
xiaoxi.austin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

第一次上传

Browse Source
master
DELL 1 year ago
parent b64a2258f6
commit 7d4a7b573c
6 changed files with 71 additions and 18 deletions
Show Stats Download Patch File Download Diff File

17
austin-data-house/pom.xml
Unescape View File

@ -34,11 +34,23 @@
</dependency> </dependency>
<!-- Hive Dependency --> <!-- Hive Dependency -->
<!-- <dependency>-->
<!-- <groupId>org.apache.hive</groupId>-->
<!-- <artifactId>hive-exec</artifactId>-->
<!-- <version>${hive-exec.version}</version>-->
<!-- <scope>provided</scope>-->
<!-- </dependency>-->
<dependency> <dependency>
<groupId>org.apache.hive</groupId> <groupId>org.apache.hive</groupId>
<artifactId>hive-exec</artifactId> <artifactId>hive-exec</artifactId>
<version>${hive-exec.version}</version> <version>2.3.4</version>
<scope>provided</scope> <scope>provided</scope>
<exclusions>
<exclusion>
<groupId>org.pentaho</groupId>
<artifactId>pentaho-aggdesigner-algorithm</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>
@ -94,7 +106,8 @@
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId> <artifactId>spring-boot-maven-plugin</artifactId>
<version>2.2.2.RELEASE</version> <version>2.3.5.RELEASE</version>
<!-- <version>2.2.2.RELEASE</version>-->
</dependency> </dependency>
</dependencies> </dependencies>
</plugin> </plugin>

3
austin-stream/pom.xml
Unescape View File

@ -98,7 +98,8 @@
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId> <artifactId>spring-boot-maven-plugin</artifactId>
<version>2.2.2.RELEASE</version> <version>2.3.5.RELEASE</version>
<!-- <version>2.2.2.RELEASE</version>-->
</dependency> </dependency>
</dependencies> </dependencies>
</plugin> </plugin>

3
austin-web/src/main/java/com/java3y/austin/web/controller/OfficialAccountController.java
Unescape View File

@ -172,7 +172,7 @@ public class OfficialAccountController {
@AustinResult @AustinResult
public CommonAmisVo getQrCode() { public CommonAmisVo getQrCode() {
try { try {
WeChatLoginConfig configService = loginUtils.getLoginConfig(); WeChatLoginConfig configService = loginUtils.getLoginConfig();//获取appId
if (Objects.isNull(configService)) { if (Objects.isNull(configService)) {
throw new CommonException(RespStatusEnum.DO_NOT_NEED_LOGIN); throw new CommonException(RespStatusEnum.DO_NOT_NEED_LOGIN);
} }
@ -197,6 +197,7 @@ public class OfficialAccountController {
@AustinResult @AustinResult
public WxMpUser checkLogin(String sceneId) { public WxMpUser checkLogin(String sceneId) {
String userInfo = redisTemplate.opsForValue().get(sceneId); String userInfo = redisTemplate.opsForValue().get(sceneId);
System.out.println("userInfo============>>>>>>>>>"+userInfo);
if (CharSequenceUtil.isBlank(userInfo)) { if (CharSequenceUtil.isBlank(userInfo)) {
throw new CommonException(RespStatusEnum.SUCCESS.getCode(), RespStatusEnum.SUCCESS.getMsg(), RespStatusEnum.NO_LOGIN); throw new CommonException(RespStatusEnum.SUCCESS.getCode(), RespStatusEnum.SUCCESS.getMsg(), RespStatusEnum.NO_LOGIN);
} }

6
austin-web/src/main/resources/application-dev.properties
Unescape View File

@ -16,5 +16,11 @@ austin.rule.engine.enabled=false
# TODO if windows os and need upload file to send message ,replace path ! # TODO if windows os and need upload file to send message ,replace path !
austin.business.upload.crowd.path=/Users/3y/temp austin.business.upload.crowd.path=/Users/3y/temp
# TODO if [login use officialAccount] switch [optional], if austin.login.official.account.enable=true
austin.login.official.account.enable=true
austin.login.official.account.appId=wx4ff374698f142efe
austin.login.official.account.secret=cc1b5c018660329ccf5ed0a5ec4f1a2c
austin.login.official.account.token=abc123

41
austin-web/src/main/resources/application-test.properties
Unescape View File

@ -1,23 +1,48 @@
server.port=7777 #server.port=7777
#
## TODO choose : [kafka]/[eventBus]/[rocketMq]/[rabbitMq],recommend [eventBus] or [kafka]
#austin.mq.pipeline=kafka
#
## todo [xxl-job] switch
#austin.xxl.job.enabled=true
#
## todo choose: [apollo]/[nacos] switch ,if [apollo] and [nacos] both false, use local.properties
#austin.apollo.enabled=false
#austin.nacos.enabled=true
#
## TODO [hades] switch
#austin.rule.engine.enabled=true
#
## TODO if windows os and need upload file to send message ,replace path !
#austin.business.upload.crowd.path=/Users/3y/temp
#
## TODO if [login use officialAccount] switch [optional], if austin.login.official.account.enable=true
#austin.login.official.account.enable=true
#austin.login.official.account.appId=wx27f83ca10e06b325
#austin.login.official.account.secret=203299484df873a18621d076db46fa99
#austin.login.official.account.token=austin123
server.port=8080
# TODO choose : [kafka]/[eventBus]/[rocketMq]/[rabbitMq],recommend [eventBus] or [kafka] # TODO choose : [kafka]/[eventBus]/[rocketMq]/[rabbitMq],recommend [eventBus] or [kafka]
austin.mq.pipeline=kafka austin.mq.pipeline=eventBus
# todo [xxl-job] switch # todo [xxl-job] switch
austin.xxl.job.enabled=true austin.xxl.job.enabled=false
# todo choose: [apollo]/[nacos] switch ,if [apollo] and [nacos] both false, use local.properties # todo choose: [apollo]/[nacos] switch ,if [apollo] and [nacos] both false, use local.properties
austin.apollo.enabled=false austin.apollo.enabled=false
austin.nacos.enabled=true austin.nacos.enabled=false
# TODO [hades] switch # TODO [hades] switch
austin.rule.engine.enabled=true austin.rule.engine.enabled=false
# TODO if windows os and need upload file to send message ,replace path ! # TODO if windows os and need upload file to send message ,replace path !
austin.business.upload.crowd.path=/Users/3y/temp austin.business.upload.crowd.path=/Users/3y/temp
# TODO if [login use officialAccount] switch [optional], if austin.login.official.account.enable=true # TODO if [login use officialAccount] switch [optional], if austin.login.official.account.enable=true
austin.login.official.account.enable=true austin.login.official.account.enable=true
austin.login.official.account.appId=wx27f83ca10e06b325 austin.login.official.account.appId=wx4ff374698f142efe
austin.login.official.account.secret=203299484df873a18621d076db46fa99 austin.login.official.account.secret=cc1b5c018660329ccf5ed0a5ec4f1a2c
austin.login.official.account.token=austin123 austin.login.official.account.token=abc123

19
austin-web/src/main/resources/application.properties
Unescape View File

@ -4,9 +4,15 @@ spring.application.name=austin
########################################## database start ########################################## ########################################## database start ##########################################
# TODO required! # TODO required!
# notice:mysql version 5.7x !!! # notice:mysql version 5.7x !!!
spring.datasource.url=jdbc:mysql://${austin.database.ip:austin-mysql}:${austin.database.port:3306}/austin?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false&zeroDateTimeBehavior=convertToNull #spring.datasource.url=jdbc:mysql://${austin.database.ip:austin-mysql}:${austin.database.port:3306}/austin?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false&zeroDateTimeBehavior=convertToNull
spring.datasource.username=${austin.database.username:root} #spring.datasource.username=${austin.database.username:root}
spring.datasource.password=${austin.database.password:root123_A} #spring.datasource.password=${austin.database.password:root123_A}
#spring.datasource.url=jdbc:mysql://${austin.database.ip:localhost}:${austin.database.port:3306}/austin?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false&zeroDateTimeBehavior=convertToNull
#spring.datasource.username=${austin.database.username:root}
#spring.datasource.password=${austin.database.password:root}
spring.datasource.url=jdbc:mysql://106.14.42.180:3306/austin?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false&zeroDateTimeBehavior=convertToNull
spring.datasource.username=root
spring.datasource.password=Wang5322570.
spring.datasource.driver-class-name=com.mysql.jdbc.Driver spring.datasource.driver-class-name=com.mysql.jdbc.Driver
spring.datasource.type=com.zaxxer.hikari.HikariDataSource spring.datasource.type=com.zaxxer.hikari.HikariDataSource
spring.datasource.hikari.minimum-idle=10 spring.datasource.hikari.minimum-idle=10
@ -22,9 +28,10 @@ spring.datasource.hikari.validation-timeout=1000
########################################## redis start ########################################## ########################################## redis start ##########################################
# TODO required! # TODO required!
spring.redis.host=${austin.redis.ip:austin-redis} #spring.redis.host=${austin.redis.ip:austin-redis}
spring.redis.port=${austin.redis.port:6379} #spring.redis.port=${austin.redis.port:6379}
spring.redis.password=${austin.redis.password:austin} #spring.redis.password=${austin.redis.password:austin}
spring.redis.host=${austin.redis.ip:127.0.0.1}
########################################## redis end ########################################## ########################################## redis end ##########################################

Write Preview
Loading…
Cancel
Save