Merge branch 'V1.0.11_performance' of http://10.87.21.221:8000/jzyd_yyds/soc into V1.0.11_performance

 Conflicts:
	soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/impl/SysUserServiceImpl.java

project_data/sql/1.0.11/soc/soc.sql

@@ -0,0 +1,20 @@
+-- v 1.0.11 版本升级脚本
+
+alter table mediator_video_integrity_check
+    modify record_span longtext null comment '原始录像索引';
+alter table mediator_video_integrity_check_log
+    modify record_span longtext null comment '原始录像索引';
+
+delete from sys_config where config_key = 'TOKEN_LARGESCREEN_EXPIRETIME';
+INSERT INTO `sys_config`(config_name,config_key,config_value,config_type,create_by,create_time,update_by,update_time,remark)
+VALUES ('终端token过期时间（单位:分钟）', 'TOKEN_LARGESCREEN_EXPIRETIME', '1500', 'Y', null, null, '', null, null);
+
+delete from sys_config where config_key = 'TOKEN_WEB_EXPIRETIME';
+INSERT INTO `sys_config`(config_name,config_key,config_value,config_type,create_by,create_time,update_by,update_time,remark)
+VALUES ('web token过期时间（单位:分钟）', 'TOKEN_WEB_EXPIRETIME', '480', 'Y', null, null, '', null, null);
+
+delete from sys_config where config_key = 'TOKEN_APP_EXPIRETIME';
+INSERT INTO `sys_config`(config_name,config_key,config_value,config_type,create_by,create_time,update_by,update_time,remark)
+VALUES ('app token过期时间（单位:分钟）', 'TOKEN_APP_EXPIRETIME', '480', 'Y', null, null, '', null, null);
+
+-- 升级脚本执行完成

soc-modules/soc-modules-deploy/src/main/resources/logback.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration scan="true" scanPeriod="60 seconds" debug="false">
     <!-- 日志存放路径 -->
-    <property name="log.path" value="logs/soc-depoly" />
+    <property name="log.path" value="logs/soc-deploy" />
     <!-- 日志输出格式 -->
     <property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
 

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/controller/SysLogininforController.java

@@ -75,6 +75,12 @@ public class SysLogininforController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody SysLogininfor logininfor)
     {
-        return toAjax(logininforService.insertLogininfor(logininfor));
+        try{
+            logininforService.insertLogininfor(logininfor);
+            return success();
+        }catch (Exception e){
+            e.printStackTrace();
+            return error();
+        }
     }
 }

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/ISysLogininforService.java

@@ -26,7 +26,7 @@ public interface ISysLogininforService extends IService<SysLogininfor>
      *
      * @param logininfor 访问日志对象
      */
-    int insertLogininfor(SysLogininfor logininfor);
+    Integer insertLogininfor(SysLogininfor logininfor);
 
     /**
      * 查询系统登录日志集合

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/impl/SysLogininforServiceImpl.java

@@ -17,6 +17,7 @@ import com.xunmei.system.service.ISysLogininforService;
 import com.xunmei.system.vo.area.SysLoginInfoExportVo;
 import com.xunmei.system.vo.area.ValueCellWriteHandler;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 
 import javax.servlet.http.HttpServletResponse;
@@ -63,8 +64,9 @@ public class SysLogininforServiceImpl extends ServiceImpl<SysLogininforMapper, S
      *
      * @param logininfor 访问日志对象
      */
+    @Async
     @Override
-    public int insertLogininfor(SysLogininfor logininfor) {
+    public Integer insertLogininfor(SysLogininfor logininfor) {
         return logininforMapper.insertLogininfor(logininfor);
     }