diff --git a/web/src/main/java/com/ibeetl/jlw/service/WebPlatformService.java b/web/src/main/java/com/ibeetl/jlw/service/WebPlatformService.java index 2ca3cad1..ff94cebd 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/WebPlatformService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/WebPlatformService.java @@ -133,8 +133,10 @@ public class WebPlatformService { CoreOrg currentOrg = userLoginInfo.getCurrentOrg(); List orgs = userLoginInfo.getOrgs(); String headerToken = httpRequestLocal.getRequestToken(); - corePlatformService.setLoginUserByToken(headerToken, user, currentOrg, orgs, null); - setUserInfoToSessionByIdentity(headerToken, user); + if (headerToken != null) { + corePlatformService.setLoginUserByToken(headerToken, user, currentOrg, orgs, null); + setUserInfoToSessionByIdentity(headerToken, user); + } String token = ""; Student student = studentService.getByUserId(user.getId()); diff --git a/web/src/main/java/com/ibeetl/jlw/web/IndexController.java b/web/src/main/java/com/ibeetl/jlw/web/IndexController.java index 13b3ecba..d14aa5e9 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/IndexController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/IndexController.java @@ -1054,7 +1054,7 @@ public class IndexController { * 微信网页授权域名 * @return */ - @GetMapping("${weinxin.auth-text-key:MP_verify_kR8QcYpBTyrYJWvG.txt}") + @GetMapping("${weinxin.auth-text-key:'MP_verify_kR8QcYpBTyrYJWvG.txt'}") @ResponseBody public String weixinTextAuth() { return environment.getProperty("weinxin.auth-text-value", "kR8QcYpBTyrYJWvG"); diff --git a/web/src/main/resources/application-test.properties b/web/src/main/resources/application-test.properties index bbda260d..d4f0393f 100644 --- a/web/src/main/resources/application-test.properties +++ b/web/src/main/resources/application-test.properties @@ -22,7 +22,7 @@ spring.datasource.dynamic.hikari.connection-test-query=SELECT 1 # master spring.datasource.dynamic.datasource.master.driverClassName=com.mysql.cj.jdbc.Driver -spring.datasource.dynamic.datasource.master.url=jdbc:mysql://10.0.12.13:3306/tzcj?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowMultiQueries=true +spring.datasource.dynamic.datasource.master.url=jdbc:mysql://124.223.219.235:3306/tzcj?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowMultiQueries=true spring.datasource.dynamic.datasource.master.username=root spring.datasource.dynamic.datasource.master.password=yaL3FQ6SbdmWksBV spring.datasource.dynamic.datasource.master.hikari.max-lifetime=60000 @@ -81,4 +81,8 @@ system.config.sysImgs=https://gimg2.baidu.com/image_search/src=http%3A%2F%2F5b09 ||||||https://gimg2.baidu.com/image_search/src=http%3A%2F%2Fimg.jiaoyubao.cn%2Fimages%2Fqd%2Fbeile%2Fke3.gif&refer=http%3A%2F%2Fimg.jiaoyubao.cn&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=auto?sec=1674228622&t=34eeefbead6c6e55964ec797664256ac\ ||||||https://gimg2.baidu.com/image_search/src=http%3A%2F%2Fp1.itc.cn%2Fq_70%2Fimages03%2F20201120%2F6f26a6b508764b03b2ceb433c0adaf58.jpeg&refer=http%3A%2F%2Fp1.itc.cn&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=auto?sec=1674228622&t=a2506d989d9e3fc7b8c7bd84c7c8ade0 - +we_chat.appId=wx40945fbf601b74a2 +we_chat.appSecret=4cf714e3c4f3814a38c947de45de2a61 +we_chat.token=488954 +we_chat.aesKey=rHcC0bFnAGmDHow9N4XpIxFWeRVgi3EJ4vP3rMJe92E +we_chat.codeBackUrl=http://yangdj.qicp.vip/server/wx/getCode \ No newline at end of file