Merge remote-tracking branch 'origin/master'

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/core/handler/BaseAuthenticationSuccessEventHandler.java

@@ -9,6 +9,9 @@ import java.util.Map;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import com.ym.mec.common.entity.ImResult;
+import com.ym.mec.common.entity.ImUserModel;
+import com.ym.mec.im.ImFeignService;
 import org.apache.commons.collections.MapUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -51,6 +54,8 @@ public class BaseAuthenticationSuccessEventHandler extends SavedRequestAwareAuth
 	private SysUserService sysUserService;
 	@Autowired
 	private ObjectMapper objectMapper;
+	@Autowired
+	private ImFeignService imFeignService;
 	
 	@Autowired
 	private ClientDetailsService clientDetailsService;
@@ -71,6 +76,12 @@ public class BaseAuthenticationSuccessEventHandler extends SavedRequestAwareAuth
 		}else {
 			sysUser = sysUserService.queryByPhone(username.split(":")[1]);
 		}
+		if(StringUtils.isEmpty(sysUser.getImToken())){
+			ImResult register = imFeignService.register(new ImUserModel(sysUser.getId().toString(), sysUser.getUsername(), "https://daya-online.oss-cn-beijing.aliyuncs.com/201910/RgLS0KQ.jpeg"));
+			sysUser.setImToken(register.getToken());
+			sysUser.setUpdateTime(new Date());
+			sysUserService.update(sysUser);
+		}
 		Date date = new Date();
 		//修改添加登录信息
 		SysUserLogin userLogin = sysUserLoginService.findLoginByUserId(sysUser.getId());

mec-gateway/mec-gateway-web/src/main/resources/application.yml

@@ -12,30 +12,29 @@ server:
       request-attributes-enabled: false
       rotate: true
       suffix: .log
-  
+
 spring:
   application:
     name: gateway-web
-    
+
   servlet:
     multipart:
       max-file-size: 10MB
 
 eureka:
   client:
-    registry-fetch-interval-seconds: 5
     serviceUrl:
       defaultZone: http://admin:admin123@localhost:8761/eureka/eureka/
-    instance: 
+    instance:
       lease-renewal-interval-in-seconds: 5
 
 ribbon:
   eureka:
     enable: true
   ReadTimeout: 30000
-  SocketTimeout: 10000      
+  SocketTimeout: 10000
 
-### 配置网关反向代理    
+### 配置网关反向代理
 zuul:
   routes:
     api-auth:
@@ -44,52 +43,75 @@ zuul:
       serviceId: auth-server
       #url: http://localhost:8001/
       ##加上下面参数，可将header信息传递至下游
-      #sensitiveHeaders: 
+      #sensitiveHeaders:
     api-task:
       ### 以 /api-auth/访问转发到会员服务
       path: /api-task/**
       serviceId: task-server
       #url: http://localhost:8001/
       ##加上下面参数，可将header信息传递至下游
-      #sensitiveHeaders: 
+      #sensitiveHeaders:
     api-cms:
       ### 以 /api-auth/访问转发到会员服务
       path: /api-cms/**
       serviceId: cms-server
       #url: http://localhost:8001/
       ##加上下面参数，可将header信息传递至下游
-      #sensitiveHeaders: 
+      #sensitiveHeaders:
     api-web:
+      ### 以 /api-auth/访问转发到会员服务
       path: /api-web/**
       serviceId: web-server
-    api-teacher:
-      path: /api-teacher/**
-      serviceId: teacher-server
+      #url: http://localhost:8001/
+      ##加上下面参数，可将header信息传递至下游
+      #sensitiveHeaders: Cookie,Set-Cookie
+    api-im:
+      ### 以 /api-auth/访问转发到会员服务
+      path: /api-im/**
+      serviceId: im-server
+      #url: http://localhost:8001/
+      ##加上下面参数，可将header信息传递至下游
+      #sensitiveHeaders:
     api-student:
+      ### 以 /api-auth/访问转发到会员服务
       path: /api-student/**
       serviceId: student-server
+      #url: http://localhost:8001/
+      ##加上下面参数，可将header信息传递至下游
+      #sensitiveHeaders:
+    api-teacher:
+      ### 以 /api-auth/访问转发到会员服务
+      path: /api-teacher/**
+      serviceId: teacher-server
+      #url: http://localhost:8001/
+      ##加上下面参数，可将header信息传递至下游
+      #sensitiveHeaders:
     api-education:
+      ### 以 /api-auth/访问转发到会员服务
       path: /api-education/**
       serviceId: education-server
+      #url: http://localhost:8001/
+      ##加上下面参数，可将header信息传递至下游
+      #sensitiveHeaders:
   #忽略某个微服务
   ignored-services: eureka-server
   #重试
   retryable: false
-  #请求处理超时--只针对url的路由
-  ReadTimeout: 60000
-  #连接超时--只针对url的路由
-  ConnectTimeout: 10000
-  sensitiveHeaders: 
-  
-hystrix: 
-  command: 
-    default: 
-      execution: 
-        isolation: 
-          thread: 
+  #请求处理超时
+  ReadTimeout: 600000
+  #连接超时
+  ConnectTimeout: 100000
+  sensitiveHeaders:
+
+hystrix:
+  command:
+    default:
+      execution:
+        isolation:
+          thread:
             timeoutInMilliseconds: 60000
-            
-            
+
+
 #spring boot admin 相关配置
 management:
   endpoints:

mec-web/src/main/resources/application.yml

@@ -17,7 +17,7 @@ eureka:
   client:
     serviceUrl:
       defaultZone: http://admin:admin123@localhost:8761/eureka/eureka/
-    instance: 
+    instance:
       lease-renewal-interval-in-seconds: 5
 
 spring:
@@ -27,12 +27,15 @@ spring:
       max-request-size: 10485760
   application:
     name: web-server
-    
+
   datasource:
     name: test
-    url: jdbc:mysql://47.99.212.176:3306/mec_dev?useUnicode=true&characterEncoding=UTF8&serverTimezone=Asia/Shanghai&allowMultiQueries=true
-    username: mec_dev
-    password: mec_dev
+#    url: jdbc:mysql://47.99.212.176:3306/mec_dev?useUnicode=true&characterEncoding=UTF8&serverTimezone=Asia/Shanghai&allowMultiQueries=true
+    url: jdbc:mysql://47.99.212.176:3306/mec_data_online?useUnicode=true&characterEncoding=UTF8&serverTimezone=Asia/Shanghai
+    username: dayaData
+    password: dayaDataOnline2019
+#    username: mec_dev
+#    password: mec_dev
     # 使用druid数据源
     type: com.alibaba.druid.pool.DruidDataSource
     driver-class-name: com.mysql.cj.jdbc.Driver
@@ -49,7 +52,7 @@ spring:
     testOnReturn: false
     poolPreparedStatements: true
     maxOpenPreparedStatements: 20
-    
+
   redis:
     host: 47.99.212.176
     port: 6379
@@ -68,13 +71,14 @@ spring:
       min-idle: 0
 
 mybatis:
-    mapperLocations: classpath:config/mybatis/*.xml
-    configuration:
-        log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+  mapperLocations: classpath:config/mybatis/*.xml
+  configuration:
+  #log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+
 swagger:
   base-package: com.ym.mec.web.controller
- 
-##认证 
+
+##认证
 security:
   oauth2:
     client:
@@ -82,7 +86,7 @@ security:
       client-secret: app
     resource:
       token-info-uri: http://localhost:8001/oauth/check_token
-  
+
 #spring boot admin 相关配置
 management:
   endpoints:
@@ -92,8 +96,21 @@ management:
   endpoint:
     health:
       show-details: ALWAYS
-  
 
-ribbon:  
-    ReadTimeout: 60000  
-    ConnectTimeout: 60000
+
+ribbon:
+  ReadTimeout: 60000
+  ConnectTimeout: 60000
+
+logging:
+  level:
+    com.ym.mec.auth.api.client.SysUserFeignService: INFO
+
+message:
+  debugMode: true
+
+##支付流水隐藏
+payment:
+  hiddenMode: true
+  #隐藏的支付方式
+  channel: YQPAY,