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-biz/src/main/java/com/ym/mec/biz/service/impl/ClassGroupServiceImpl.java

@@ -1293,14 +1293,13 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         }
         Integer schoolId = musicGroup.getSchoolId();
 
-        List<Integer> subjectIdSet = new ArrayList<>();
-
         List<Integer> studentIdList = classGroup4MixDto.getStudents();
+
         List<StudentRegistration> studentList = studentRegistrationService.findStudentListByUserIdList(musicGroupId, studentIdList);
-        for (StudentRegistration student : studentList) {
-            subjectIdSet.add(student.getSubjectId());
-        }
-        List<Subject> subjectList = subjectService.findBySubjectByIdList(subjectIdSet);
+
+        List<Integer> subjectIdList = studentList.stream().map(studentRegistration -> studentRegistration.getActualSubjectId()).collect(Collectors.toList());
+
+        List<Subject> subjectList = subjectService.findBySubjectByIdList(subjectIdList);
 
         String subjectIds = subjectList.stream().map(subject -> subject.getId().toString()).collect(Collectors.joining(","));
         String subjectNames = subjectList.stream().map(subject -> subject.getName()).collect(Collectors.joining("/"));

mec-biz/src/main/resources/config/mybatis/SysUserCashAccountDetailMapper.xml

@@ -19,7 +19,7 @@
         <result column="comment_" property="comment"/>
         <result column="create_time_" property="createTime"/>
         <result column="update_time_" property="updateTime"/>
-        <result column="attribute_" property="attribute"/>
+        <result column="attribute1_" property="attribute"/>
         <result column="channel_" property="channel"/>
         <result column="platform_account_no_" property="platformAccountNo"/>
     </resultMap>
@@ -53,7 +53,7 @@
             <if test="comment!=null">comment_,</if>
             <if test="createTime!=null">create_time_,</if>
             <if test="updateTime!=null">update_time_,</if>
-            <if test="attribute!=null">attribute_,</if>
+            <if test="attribute!=null">attribute1_,</if>
             <if test="channel!=null">channel_,</if>
             <if test="platformAccountNo!=null">platform_account_no_,</if>
         </trim>
@@ -80,7 +80,7 @@
     <insert id="batchInsert" parameterType="com.ym.mec.biz.dal.entity.SysUserCashAccountDetail" useGeneratedKeys="true"
             keyColumn="id" keyProperty="id">
         INSERT INTO sys_user_cash_account_detail
-        (user_id_,trans_no_,type_,trans_type_,status_,amount_,balance_,description_,comment_,create_time_,update_time_,attribute_,channel_,platform_account_no_)
+        (user_id_,trans_no_,type_,trans_type_,status_,amount_,balance_,description_,comment_,create_time_,update_time_,attribute1_,channel_,platform_account_no_)
         VALUE
         <foreach collection="sysUserCashAccountDetails" item="sysUserCashAccountDetail" separator=",">
             (#{sysUserCashAccountDetail.userId},#{sysUserCashAccountDetail.transNo},#{sysUserCashAccountDetail.type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{sysUserCashAccountDetail.transType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{sysUserCashAccountDetail.status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{sysUserCashAccountDetail.amount},#{sysUserCashAccountDetail.balance},#{sysUserCashAccountDetail.description},#{sysUserCashAccountDetail.comment},now(),now(),#{sysUserCashAccountDetail.attribute},#{sysUserCashAccountDetail.channel},#{sysUserCashAccountDetail.platformAccountNo})
@@ -122,7 +122,7 @@
                 trans_type_ = #{transType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
             </if>
             <if test="attribute != null">
-                attribute_ = #{attribute},
+                attribute1_ = #{attribute},
             </if>
             <if test="channel != null">
                 channel_ = #{channel},

mec-eureka/src/main/resources/bootstrap.properties → mec-eureka/src/main/resources/bootstrap-dev.properties

@@ -1,7 +1,7 @@
 #\u6307\u5b9a\u5f00\u53d1\u73af\u5883
 #spring.profiles.active=dev
 #\u670d\u52a1\u5668\u5730\u5740
-spring.cloud.nacos.config.server-addr=localhost:8848
+spring.cloud.nacos.config.server-addr=47.99.212.176:8848
 #\u9ed8\u8ba4\u4e3aPublic\u547d\u540d\u7a7a\u95f4,\u53ef\u4ee5\u7701\u7565\u4e0d\u5199
 spring.cloud.nacos.config.namespace=40ebb2ed-23ac-4afb-b48f-8d727f332edc
 #\u6307\u5b9a\u914d\u7f6e\u7fa4\u7ec4 --\u5982\u679c\u662fPublic\u547d\u540d\u7a7a\u95f4 \u5219\u53ef\u4ee5\u7701\u7565\u7fa4\u7ec4\u914d\u7f6e

mec-eureka/src/main/resources/bootstrap-prod.properties

@@ -0,0 +1,16 @@
+#\u6307\u5b9a\u5f00\u53d1\u73af\u5883
+#spring.profiles.active=dev
+#\u670d\u52a1\u5668\u5730\u5740
+spring.cloud.nacos.config.server-addr=47.99.212.176:8848
+#\u9ed8\u8ba4\u4e3aPublic\u547d\u540d\u7a7a\u95f4,\u53ef\u4ee5\u7701\u7565\u4e0d\u5199
+spring.cloud.nacos.config.namespace=40ebb2ed-23ac-4afb-b48f-8d727f332edc
+#\u6307\u5b9a\u914d\u7f6e\u7fa4\u7ec4 --\u5982\u679c\u662fPublic\u547d\u540d\u7a7a\u95f4 \u5219\u53ef\u4ee5\u7701\u7565\u7fa4\u7ec4\u914d\u7f6e
+spring.cloud.nacos.config.group=DEFAULT_GROUP
+#\u6587\u4ef6\u540d -- \u5982\u679c\u6ca1\u6709\u914d\u7f6e\u5219\u9ed8\u8ba4\u4e3a ${spring.appliction.name}
+spring.cloud.nacos.config.prefix=eureka
+#\u6307\u5b9a\u6587\u4ef6\u540e\u7f00
+spring.cloud.nacos.config.file-extension=yaml
+#\u662f\u5426\u52a8\u6001\u5237\u65b0
+spring.cloud.nacos.config.refresh.enabled=true
+#\u662f\u5426\u542f\u7528nacos\u914d\u7f6e\u4e2d\u5fc3
+spring.cloud.nacos.config.enabled=true

mec-eureka/src/main/resources/bootstrap-test.properties

@@ -0,0 +1,16 @@
+#\u6307\u5b9a\u5f00\u53d1\u73af\u5883
+#spring.profiles.active=dev
+#\u670d\u52a1\u5668\u5730\u5740
+spring.cloud.nacos.config.server-addr=47.99.212.176:8848
+#\u9ed8\u8ba4\u4e3aPublic\u547d\u540d\u7a7a\u95f4,\u53ef\u4ee5\u7701\u7565\u4e0d\u5199
+spring.cloud.nacos.config.namespace=02105743-16b8-46ab-87df-2aca0f3dbca3
+#\u6307\u5b9a\u914d\u7f6e\u7fa4\u7ec4 --\u5982\u679c\u662fPublic\u547d\u540d\u7a7a\u95f4 \u5219\u53ef\u4ee5\u7701\u7565\u7fa4\u7ec4\u914d\u7f6e
+spring.cloud.nacos.config.group=DEFAULT_GROUP
+#\u6587\u4ef6\u540d -- \u5982\u679c\u6ca1\u6709\u914d\u7f6e\u5219\u9ed8\u8ba4\u4e3a ${spring.appliction.name}
+spring.cloud.nacos.config.prefix=eureka
+#\u6307\u5b9a\u6587\u4ef6\u540e\u7f00
+spring.cloud.nacos.config.file-extension=yaml
+#\u662f\u5426\u52a8\u6001\u5237\u65b0
+spring.cloud.nacos.config.refresh.enabled=true
+#\u662f\u5426\u542f\u7528nacos\u914d\u7f6e\u4e2d\u5fc3
+spring.cloud.nacos.config.enabled=true

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/java/com/ym/mec/web/controller/EmployeeController.java

@@ -64,4 +64,11 @@ public class EmployeeController extends BaseController {
         employeeService.deleteEmployee(userId);
         return succeed();
     }
+
+    @ApiOperation(value = "获取所有员工")
+    @GetMapping("/findAll")
+    @PreAuthorize("@pcs.hasPermissions('employee/findAll')")
+    public Object findAll() {
+        return succeed(employeeService.findAll(null));
+    }
 }

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,