Merge remote-tracking branch 'origin/master'

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/ImGroupController.java

@@ -86,7 +86,7 @@ public class ImGroupController extends BaseController {
     @ApiOperation("退出群聊")
     @PostMapping(value = "/quit/{groupId}")
     public HttpResponseResult quit(@ApiParam(value = "群编号", required = true) @PathVariable("groupId") String groupId,
-                                   @RequestParam(value = "quit",required = false, defaultValue = "true") boolean quit
+                                   @RequestParam(value = "quit",required = false, defaultValue = "false") boolean quit
                                    ) throws Exception {
         imGroupService.quit(groupId,sysUserService.getUserId(), ClientEnum.STUDENT, quit);
         return succeed();

cooleshow-user/user-admin/src/main/resources/logback-spring.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration scan="true" scanPeriod="10 seconds">
 
-	<property name="LOG_HOME" value="/mnt/datadisk/logs/admin-%d{yyyy-MM-dd_HH}-%i.log" />
+	<property name="LOG_HOME" value="/mdata/cooleshow-test/jenkins/logs/admin-%d{yyyy-MM-dd_HH}-%i.log" />
 	<property name="CONSOLE_LOG_PATTERN"
 		value="[%X{username} %X{ip} %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36}] : %msg%n" />
 

cooleshow-user/user-student/src/main/java/com/yonge/cooleshow/student/controller/ImGroupController.java

@@ -100,7 +100,7 @@ public class ImGroupController extends BaseController {
     @ApiOperation("退出群聊")
     @PostMapping(value = "/quit/{groupId}")
     public HttpResponseResult quit(@ApiParam(value = "群编号", required = true) @PathVariable("groupId") String groupId,
-                                   @RequestParam(value = "quit",required = false,defaultValue = "true") boolean quit
+                                   @RequestParam(value = "quit",required = false,defaultValue = "false") boolean quit
                                    ) throws Exception {
         imGroupService.quit(groupId,sysUserService.getUserId(), ClientEnum.STUDENT,quit);
         return succeed();

cooleshow-user/user-teacher/src/main/java/com/yonge/cooleshow/teacher/controller/ImGroupController.java

@@ -112,7 +112,7 @@ public class ImGroupController extends BaseController {
     @ApiOperation("退出群聊")
     @PostMapping(value = "/quit/{groupId}")
     public HttpResponseResult quit(@ApiParam(value = "群编号", required = true) @PathVariable("groupId") String groupId,
-                                   @RequestParam(value = "quit",required = false,defaultValue = "true") boolean quit
+                                   @RequestParam(value = "quit",required = false,defaultValue = "false") boolean quit
                                    ) throws Exception {
         imGroupService.quit(groupId, sysUserService.getUserId(), ClientEnum.TEACHER, quit);
         return succeed();

toolset/thirdparty-component/src/main/java/com/yonge/toolset/thirdparty/user/realname/provider/LinkfaceRealnameAuthenticationPlugin.java

@@ -1,5 +1,9 @@
 package com.yonge.toolset.thirdparty.user.realname.provider;
 
+import com.alibaba.fastjson.JSONObject;
+import com.yonge.toolset.base.exception.ThirdpartyException;
+import com.yonge.toolset.thirdparty.user.realname.RealnameAuthenticationPlugin;
+import com.yonge.toolset.utils.http.HttpUtil;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -10,10 +14,8 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
-import com.alibaba.fastjson.JSONObject;
-import com.yonge.toolset.base.exception.ThirdpartyException;
-import com.yonge.toolset.thirdparty.user.realname.RealnameAuthenticationPlugin;
-import com.yonge.toolset.utils.http.HttpUtil;
+import java.util.HashMap;
+import java.util.Map;
 
 @Service
 public class LinkfaceRealnameAuthenticationPlugin implements RealnameAuthenticationPlugin {
@@ -70,10 +72,11 @@ public class LinkfaceRealnameAuthenticationPlugin implements RealnameAuthenticat
     @Override
     public boolean verify(String realname, String idcardNo) {
 
-        IdcardValidator idcardValidator = new IdcardValidator();
+        // 通过身份证号获取身份信息(后续需要改造)
+        /*IdcardValidator idcardValidator = new IdcardValidator();
         if (idcardValidator.isValidatedAllIdcard(idcardNo)) {
             return true;
-        }
+        }*/
 
         String respJson = "";
         HashMap<String, Object> params = new HashMap<String, Object>();