Browse Source

Merge remote-tracking branch 'origin/master'

zhangcaibao 4 years ago
parent
commit
4fb4d0d428

+ 2 - 2
src/main/java/com/ssj/weixin/interceptor/SetControlDataInterceptor.java

@@ -90,7 +90,7 @@ public class SetControlDataInterceptor extends HandlerInterceptorAdapter {
         User user = UserUtil.getUser(request);
         if(!notCheckPhoneList.contains(url)){
 			if(StringUtils.isEmpty(user.getMobile())){
-				String sysUrl=(String) SystemResourceLocator.getValue("sys_url");
+				String sysUrl="https://book.sharingschool.com";
 				//String sysUrl= "http://localhost:8081/";
 				response.sendRedirect(sysUrl+"/weixin/mylib/bindingMobilePhone.html?redirectUrl="+(sysUrl+url));
 				return false;
@@ -120,7 +120,7 @@ public class SetControlDataInterceptor extends HandlerInterceptorAdapter {
         	tokenManager.createWxOpenId(openid, subscribe);
         }
         modelAndView.addObject("subscribe",subscribe);
-        modelAndView.addObject("sysUrl", SystemResourceLocator.getValue("sys_url"));
+        modelAndView.addObject("sysUrl", "https://book.sharingschool.com");
        // modelAndView.addObject("sysUrl", "http://127.0.0.1:8081");
         modelAndView.addObject("imgUrl", SystemResourceLocator.getValue("STATIC_FILE_URL"));
 

+ 1 - 1
src/main/resources/application-common-dev.properties

@@ -1,6 +1,6 @@
 #\u5F00\u53D1\u73AF\u5883\u6253\u5305\u65B9\u5F0F-\u914D\u7F6E\uFF08\u9ED8\u8BA4\uFF09
 
-spring.datasource.url=jdbc:mysql://172.18.106.198:8066/aijia?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&rewriteBatchedStatements=true
+spring.datasource.url=jdbc:mysql://172.18.106.198:8066/aijia?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&rewriteBatchedStatements=true&useLocalSessionState=true
 spring.datasource.username=root
 spring.datasource.password=ssj1QAZxsw2!@
 #spring.datasource.url=jdbc:mysql://120.79.215.176:8066/ssj?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false

+ 1 - 1
src/main/resources/application-common-prod.properties

@@ -1,5 +1,5 @@
 #\u6B63\u5F0F\u73AF\u5883\u6253\u5305\u65B9\u5F0F-\u914D\u7F6E
-spring.datasource.url=jdbc:mysql://172.18.30.187:8066/ssj?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
+spring.datasource.url=jdbc:mysql://172.18.30.187:8066/ssj?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&useLocalSessionState=true
 spring.datasource.username=ssj_user
 spring.datasource.password=ssjUser!@123
 

+ 1 - 1
src/main/resources/application.properties

@@ -2,7 +2,7 @@ spring.application.name=ssj-weixin
 server.port=8080
 logger.level=info
 
-spring.profiles.active=common,common-dev
+spring.profiles.active=common,@activatedProperties@
 
 spring.mvc.static-path-pattern=/static/**