diff --git a/austin-data-house/pom.xml b/austin-data-house/pom.xml
index 30b5381..c796006 100644
--- a/austin-data-house/pom.xml
+++ b/austin-data-house/pom.xml
@@ -34,11 +34,23 @@
+
+
+
+
+
+
org.apache.hive
hive-exec
- ${hive-exec.version}
+ 2.3.4
provided
+
+
+ org.pentaho
+ pentaho-aggdesigner-algorithm
+
+
@@ -94,7 +106,8 @@
org.springframework.boot
spring-boot-maven-plugin
- 2.2.2.RELEASE
+ 2.3.5.RELEASE
+
diff --git a/austin-stream/pom.xml b/austin-stream/pom.xml
index 1dd45be..0b8af3d 100644
--- a/austin-stream/pom.xml
+++ b/austin-stream/pom.xml
@@ -98,7 +98,8 @@
org.springframework.boot
spring-boot-maven-plugin
- 2.2.2.RELEASE
+ 2.3.5.RELEASE
+
diff --git a/austin-web/src/main/java/com/java3y/austin/web/controller/OfficialAccountController.java b/austin-web/src/main/java/com/java3y/austin/web/controller/OfficialAccountController.java
index 7ed8841..5e2d16d 100644
--- a/austin-web/src/main/java/com/java3y/austin/web/controller/OfficialAccountController.java
+++ b/austin-web/src/main/java/com/java3y/austin/web/controller/OfficialAccountController.java
@@ -172,7 +172,7 @@ public class OfficialAccountController {
@AustinResult
public CommonAmisVo getQrCode() {
try {
- WeChatLoginConfig configService = loginUtils.getLoginConfig();
+ WeChatLoginConfig configService = loginUtils.getLoginConfig();//获取appId
if (Objects.isNull(configService)) {
throw new CommonException(RespStatusEnum.DO_NOT_NEED_LOGIN);
}
@@ -197,6 +197,7 @@ public class OfficialAccountController {
@AustinResult
public WxMpUser checkLogin(String sceneId) {
String userInfo = redisTemplate.opsForValue().get(sceneId);
+ System.out.println("userInfo============>>>>>>>>>"+userInfo);
if (CharSequenceUtil.isBlank(userInfo)) {
throw new CommonException(RespStatusEnum.SUCCESS.getCode(), RespStatusEnum.SUCCESS.getMsg(), RespStatusEnum.NO_LOGIN);
}
diff --git a/austin-web/src/main/resources/application-dev.properties b/austin-web/src/main/resources/application-dev.properties
index e0a6ac4..d41f2f3 100644
--- a/austin-web/src/main/resources/application-dev.properties
+++ b/austin-web/src/main/resources/application-dev.properties
@@ -16,5 +16,11 @@ austin.rule.engine.enabled=false
# 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=wx4ff374698f142efe
+austin.login.official.account.secret=cc1b5c018660329ccf5ed0a5ec4f1a2c
+austin.login.official.account.token=abc123
+
diff --git a/austin-web/src/main/resources/application-test.properties b/austin-web/src/main/resources/application-test.properties
index 21bd0a4..36a46d1 100644
--- a/austin-web/src/main/resources/application-test.properties
+++ b/austin-web/src/main/resources/application-test.properties
@@ -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]
-austin.mq.pipeline=kafka
+austin.mq.pipeline=eventBus
# 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
austin.apollo.enabled=false
-austin.nacos.enabled=true
+austin.nacos.enabled=false
# 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 !
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
\ No newline at end of file
+austin.login.official.account.appId=wx4ff374698f142efe
+austin.login.official.account.secret=cc1b5c018660329ccf5ed0a5ec4f1a2c
+austin.login.official.account.token=abc123
\ No newline at end of file
diff --git a/austin-web/src/main/resources/application.properties b/austin-web/src/main/resources/application.properties
index a179333..f3b9451 100644
--- a/austin-web/src/main/resources/application.properties
+++ b/austin-web/src/main/resources/application.properties
@@ -4,9 +4,15 @@ spring.application.name=austin
########################################## database start ##########################################
# TODO required!
# 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.username=${austin.database.username:root}
-spring.datasource.password=${austin.database.password:root123_A}
+#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.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.type=com.zaxxer.hikari.HikariDataSource
spring.datasource.hikari.minimum-idle=10
@@ -22,9 +28,10 @@ spring.datasource.hikari.validation-timeout=1000
########################################## redis start ##########################################
# TODO required!
-spring.redis.host=${austin.redis.ip:austin-redis}
-spring.redis.port=${austin.redis.port:6379}
-spring.redis.password=${austin.redis.password:austin}
+#spring.redis.host=${austin.redis.ip:austin-redis}
+#spring.redis.port=${austin.redis.port:6379}
+#spring.redis.password=${austin.redis.password:austin}
+spring.redis.host=${austin.redis.ip:127.0.0.1}
########################################## redis end ##########################################