Merge branch 'master' into feature-zjw

ace-auth/ace-auth-server/src/main/resources/logback.xml

@@ -22,7 +22,7 @@
 		<filter class="com.github.wxiaoqi.security.common.filter.DenyFilter"></filter>
 		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
 			<FileNamePattern>${LOG_HOME}/sys.%d{yyyy-MM-dd}.log</FileNamePattern><!--日志文件输出的文件名 -->
-			<MaxHistory>30</MaxHistory><!--日志文件保留天数 -->
+			<MaxHistory>60</MaxHistory><!--日志文件保留天数 -->
 		</rollingPolicy>
 		<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
 			<Pattern>${CONSOLE_LOG_PATTERN}</Pattern><!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符 -->
@@ -33,7 +33,7 @@
 		<filter class="com.github.wxiaoqi.security.common.filter.AcceptFilter"></filter>
 		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
 			<FileNamePattern>${LOG_HOME}/log.%d{yyyy-MM-dd}.log</FileNamePattern><!--日志文件输出的文件名 -->
-			<MaxHistory>30</MaxHistory><!--日志文件保留天数 -->
+			<MaxHistory>60</MaxHistory><!--日志文件保留天数 -->
 		</rollingPolicy>
 		<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
 			<Pattern>${CONSOLE_LOG_PATTERN}</Pattern><!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符 -->

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserPositionChangeRecordBiz.java

@@ -16,6 +16,7 @@ import tk.mybatis.mapper.entity.Example;
 import java.sql.Timestamp;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 @Transactional
 @Service("appUserPositionChangeRecordBiz")
@@ -43,26 +44,26 @@ public class AppUserPositionChangeRecordBiz extends BaseBiz<AppUserPositionChang
     public void addPositionChangeRecord(AppUserPositionTemp userPositionTemp, AppUserPositionTemp oldData, Integer operatorId, Timestamp relTime) {
         AppUserPositionChangeRecord appUserPositionChangeRecord = new AppUserPositionChangeRecord();
 
-        if (!(userPositionTemp.getIsQuit().equals(oldData.getIsQuit()))) {
+        if (Objects.nonNull(userPositionTemp.getIsQuit()) && !(userPositionTemp.getIsQuit().equals(oldData.getIsQuit()))) {
             appUserPositionChangeRecord.setJobRemark(USER_LEAVE_COMPANT);
         }
 
         //状态1：职位变动
-        if (!(userPositionTemp.getJobId().equals(oldData.getJobId()))) {
+        if (Objects.nonNull(userPositionTemp.getJobId()) && !(userPositionTemp.getJobId().equals(oldData.getJobId()))) {
             appUserPositionChangeRecord.setOldJobId(oldData.getJobId());
             appUserPositionChangeRecord.setNewJobId(userPositionTemp.getJobId());
             appUserPositionChangeRecord.setJobRemark(JOB_CHANGE);
             findUserJobName(appUserPositionChangeRecord);
         }
         //状态2：身份变动
-        if (!(userPositionTemp.getPositionId().equals(oldData.getPositionId()))) {
+        if (Objects.nonNull(userPositionTemp.getPositionId()) && !(userPositionTemp.getPositionId().equals(oldData.getPositionId()))) {
             appUserPositionChangeRecord.setOldPositionId(oldData.getPositionId());
             appUserPositionChangeRecord.setNewPositionId(userPositionTemp.getPositionId());
             appUserPositionChangeRecord.setJobRemark(POSITION_CHANGE);
             findUserPositionName(appUserPositionChangeRecord);
         }
         //状态3：公司变动调整
-        if (!(userPositionTemp.getCompanyId().equals(oldData.getCompanyId()))) {
+        if (Objects.nonNull(userPositionTemp.getCompanyId()) && !(userPositionTemp.getCompanyId().equals(oldData.getCompanyId()))) {
             appUserPositionChangeRecord.setOldCompanyId(oldData.getCompanyId());
             appUserPositionChangeRecord.setOldCompanyName(oldData.getCompanyName());
             appUserPositionChangeRecord.setNewCompanyId(userPositionTemp.getCompanyId());
@@ -76,7 +77,7 @@ public class AppUserPositionChangeRecordBiz extends BaseBiz<AppUserPositionChang
         appUserPositionChangeRecord.setUserName(userPositionTemp.getName());
         appUserPositionChangeRecord.setCrtTime(new Timestamp(System.currentTimeMillis()));
         appUserPositionChangeRecord.setOperatorId(operatorId);
-        mapper.insert(appUserPositionChangeRecord);
+        mapper.insertSelective(appUserPositionChangeRecord);
     }
 
     /**

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/AppUsersManageController.java

 package com.github.wxiaoqi.security.admin.rest;
 
+import com.alibaba.fastjson.JSONObject;
 import com.github.pagehelper.PageInfo;
 import com.github.wxiaoqi.security.admin.biz.AppUserDetailBiz;
 import com.github.wxiaoqi.security.admin.biz.AppUserLoginBiz;
@@ -9,14 +10,17 @@ import com.github.wxiaoqi.security.admin.dto.AppUserManageDTO;
 import com.github.wxiaoqi.security.admin.entity.AppUserLogin;
 import com.github.wxiaoqi.security.admin.entity.AppUserManage;
 import com.github.wxiaoqi.security.admin.entity.User;
+import com.github.wxiaoqi.security.admin.rpc.service.AppPermissionService;
 import com.github.wxiaoqi.security.admin.vo.AppUserManageVo;
 import com.github.wxiaoqi.security.admin.vo.AppUserVo;
+import com.github.wxiaoqi.security.auth.client.annotation.IgnoreUserToken;
 import com.github.wxiaoqi.security.auth.client.config.UserAuthConfig;
 import com.github.wxiaoqi.security.auth.client.jwt.UserAuthUtil;
 import com.github.wxiaoqi.security.auth.common.util.jwt.IJWTInfo;
 import com.github.wxiaoqi.security.common.exception.BaseException;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.rest.BaseController;
+import com.github.wxiaoqi.security.common.util.process.SystemConfig;
 import com.xxfc.platform.vehicle.feign.VehicleFeign;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -37,6 +41,9 @@ public class AppUsersManageController extends BaseController<AppUserManageBiz,Ap
     @Autowired
     private AppUserLoginBiz appUserLoginBiz;
 
+    @Autowired
+    private AppPermissionService appPermissionService;
+
     @Autowired
     private AppUserDetailBiz appUserDetailBiz;
 
@@ -158,5 +165,28 @@ public class AppUsersManageController extends BaseController<AppUserManageBiz,Ap
         }
     }
 
+    /**
+     * 注册
+     * @param username
+     * @return
+     */
+    @RequestMapping(value = "app/unauth/register", method = RequestMethod.POST)
+    @IgnoreUserToken
+    public @ResponseBody
+    JSONObject register(
+            @RequestParam(value="username",defaultValue="")String  username
+    ){
+        //默认昵称
+        String nickname= SystemConfig.USER_NIKENAME_DEFAULT+(int)((Math.random()*9+1)*100000);
+        String headimgurl=SystemConfig.USER_HEADER_URL_DEFAULT;
+        try {
+        return appPermissionService.adminRegister(username,  username,headimgurl,
+                 nickname, null,-1);
+        } catch (Exception e) {
+            log.error("修改失败【{}】", e);
+            throw new BaseException("修改失败");
+        }
+    }
+
 }
 

ace-modules/ace-admin/src/main/resources/logback.xml

@@ -22,7 +22,7 @@
 		<filter class="com.github.wxiaoqi.security.common.filter.DenyFilter"></filter>
 		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
 			<FileNamePattern>${LOG_HOME}/sys.%d{yyyy-MM-dd}.log</FileNamePattern><!--日志文件输出的文件名 -->
-			<MaxHistory>30</MaxHistory><!--日志文件保留天数 -->
+			<MaxHistory>60</MaxHistory><!--日志文件保留天数 -->
 		</rollingPolicy>
 		<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
 			<Pattern>${CONSOLE_LOG_PATTERN}</Pattern><!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符 -->
@@ -33,7 +33,7 @@
 		<filter class="com.github.wxiaoqi.security.common.filter.AcceptFilter"></filter>
 		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
 			<FileNamePattern>${LOG_HOME}/log.%d{yyyy-MM-dd}.log</FileNamePattern><!--日志文件输出的文件名 -->
-			<MaxHistory>30</MaxHistory><!--日志文件保留天数 -->
+			<MaxHistory>60</MaxHistory><!--日志文件保留天数 -->
 		</rollingPolicy>
 		<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
 			<Pattern>${CONSOLE_LOG_PATTERN}</Pattern><!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符 -->

ace-modules/ace-admin/src/main/resources/mapper/AppUserDetailMapper.xml

@@ -110,7 +110,7 @@
 	pl.username AS superiorMobileNumber
     FROM
 	app_user_login l
-    LEFT JOIN app_user_detail d ON d.userid = l.id
+    LEFT JOIN   app_user_detail  d ON d.userid = l.id
     LEFT JOIN app_user_login ul ON ul.id = d.inviter_account
     LEFT JOIN base_user_member m ON d.userid = m.user_id
     LEFT JOIN
@@ -137,6 +137,8 @@
     LEFT JOIN app_user_login pl ON r.parent_id = pl.id
     LEFT JOIN app_user_detail pd ON pl.id = pd.userid
     WHERE
+    d.channel>0
+    and
 	l.id = #{userId}
     </select>
 
@@ -185,9 +187,11 @@
         is_del = 0
         ) r ON l.id = r.user_id
         LEFT JOIN app_user_login pl ON r.parent_id = pl.id
-        LEFT JOIN app_user_detail pd ON pl.id = pd.userid
+        LEFT JOIN app_user_detail  pd ON pl.id = pd.userid
         WHERE
         l.isdel = 0
+        and
+        d.channel>0
         <if test="mobile !=null and mobile !='' ">
             and l.username like CONCAT('%',#{mobile},'%')
         </if>

ace-modules/ace-admin/src/main/resources/mapper/MyWaterMapper.xml

@@ -63,8 +63,8 @@ FROM
 	INNER JOIN ( SELECT `id`, `username` FROM `app_user_login` <if test="phone != null and phone != ''">
      WHERE `username`=#{phone}
 </if> ) AS `aul` ON aul.id = w.user_id
-	INNER JOIN ( SELECT `userid`, `nickname`, `realname` FROM `app_user_detail` <if test="username != null and username != ''">
+	INNER JOIN ( SELECT `userid`, `nickname`, `realname`,channel FROM `app_user_detail` <if test="username != null and username != ''">
     WHERE nickname =#{username}  OR realname =#{username}
-</if> ) AS `aud` ON aud.userid = aul.id ORDER BY `totalAmount` DESC
+</if> ) AS `aud` ON aud.userid = aul.id where aud.channel >0 ORDER BY `totalAmount` DESC
 </select>
 </mapper>
\ No newline at end of file

xx-activity/xx-activity-server/src/main/resources/logback.xml

@@ -22,7 +22,7 @@
 		<filter class="com.github.wxiaoqi.security.common.filter.DenyFilter"></filter>
 		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
 			<FileNamePattern>${LOG_HOME}/sys.%d{yyyy-MM-dd}.log</FileNamePattern><!--日志文件输出的文件名 -->
-			<MaxHistory>30</MaxHistory><!--日志文件保留天数 -->
+			<MaxHistory>60</MaxHistory><!--日志文件保留天数 -->
 		</rollingPolicy>
 		<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
 			<Pattern>${CONSOLE_LOG_PATTERN}</Pattern><!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符 -->
@@ -33,7 +33,7 @@
 		<filter class="com.github.wxiaoqi.security.common.filter.AcceptFilter"></filter>
 		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
 			<FileNamePattern>${LOG_HOME}/log.%d{yyyy-MM-dd}.log</FileNamePattern><!--日志文件输出的文件名 -->
-			<MaxHistory>30</MaxHistory><!--日志文件保留天数 -->
+			<MaxHistory>60</MaxHistory><!--日志文件保留天数 -->
 		</rollingPolicy>
 		<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
 			<Pattern>${CONSOLE_LOG_PATTERN}</Pattern><!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符 -->

xx-app/xx-app-server/src/main/resources/logback.xml

@@ -22,7 +22,7 @@
 		<filter class="com.github.wxiaoqi.security.common.filter.DenyFilter"></filter>
 		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
 			<FileNamePattern>${LOG_HOME}/sys.%d{yyyy-MM-dd}.log</FileNamePattern><!--日志文件输出的文件名 -->
-			<MaxHistory>30</MaxHistory><!--日志文件保留天数 -->
+			<MaxHistory>60</MaxHistory><!--日志文件保留天数 -->
 		</rollingPolicy>
 		<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
 			<Pattern>${CONSOLE_LOG_PATTERN}</Pattern><!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符 -->
@@ -33,7 +33,7 @@
 		<filter class="com.github.wxiaoqi.security.common.filter.AcceptFilter"></filter>
 		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
 			<FileNamePattern>${LOG_HOME}/log.%d{yyyy-MM-dd}.log</FileNamePattern><!--日志文件输出的文件名 -->
-			<MaxHistory>30</MaxHistory><!--日志文件保留天数 -->
+			<MaxHistory>60</MaxHistory><!--日志文件保留天数 -->
 		</rollingPolicy>
 		<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
 			<Pattern>${CONSOLE_LOG_PATTERN}</Pattern><!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符 -->

xx-campsite/xx-campsite-server/src/main/resources/logback.xml

@@ -22,7 +22,7 @@
 		<filter class="com.github.wxiaoqi.security.common.filter.DenyFilter"></filter>
 		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
 			<FileNamePattern>${LOG_HOME}/sys.%d{yyyy-MM-dd}.log</FileNamePattern><!--日志文件输出的文件名 -->
-			<MaxHistory>30</MaxHistory><!--日志文件保留天数 -->
+			<MaxHistory>60</MaxHistory><!--日志文件保留天数 -->
 		</rollingPolicy>
 		<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
 			<Pattern>${CONSOLE_LOG_PATTERN}</Pattern><!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符 -->
@@ -33,7 +33,7 @@
 		<filter class="com.github.wxiaoqi.security.common.filter.AcceptFilter"></filter>
 		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
 			<FileNamePattern>${LOG_HOME}/log.%d{yyyy-MM-dd}.log</FileNamePattern><!--日志文件输出的文件名 -->
-			<MaxHistory>30</MaxHistory><!--日志文件保留天数 -->
+			<MaxHistory>60</MaxHistory><!--日志文件保留天数 -->
 		</rollingPolicy>
 		<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
 			<Pattern>${CONSOLE_LOG_PATTERN}</Pattern><!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符 -->

xx-common/xx-common-platform-web/pom.xml

@@ -57,10 +57,6 @@
             <artifactId>mybatis-spring-boot-starter</artifactId>
             <version>1.3.4</version>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-actuator</artifactId>
-        </dependency>
         <dependency>
             <groupId>com.github.pagehelper</groupId>
             <artifactId>pagehelper-spring-boot-starter</artifactId>

xx-im/xx-im-server/src/main/resources/logback.xml

@@ -22,7 +22,7 @@
 		<filter class="com.github.wxiaoqi.security.common.filter.DenyFilter"></filter>
 		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
 			<FileNamePattern>${LOG_HOME}/sys.%d{yyyy-MM-dd}.log</FileNamePattern><!--日志文件输出的文件名 -->
-			<MaxHistory>30</MaxHistory><!--日志文件保留天数 -->
+			<MaxHistory>60</MaxHistory><!--日志文件保留天数 -->
 		</rollingPolicy>
 		<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
 			<Pattern>${CONSOLE_LOG_PATTERN}</Pattern><!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符 -->
@@ -33,7 +33,7 @@
 		<filter class="com.github.wxiaoqi.security.common.filter.AcceptFilter"></filter>
 		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
 			<FileNamePattern>${LOG_HOME}/log.%d{yyyy-MM-dd}.log</FileNamePattern><!--日志文件输出的文件名 -->
-			<MaxHistory>30</MaxHistory><!--日志文件保留天数 -->
+			<MaxHistory>60</MaxHistory><!--日志文件保留天数 -->
 		</rollingPolicy>
 		<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
 			<Pattern>${CONSOLE_LOG_PATTERN}</Pattern><!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符 -->

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/OrderMemberController.java

@@ -4,17 +4,17 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
 import com.github.wxiaoqi.security.admin.feign.UserFeign;
 import com.github.wxiaoqi.security.auth.client.annotation.IgnoreClientToken;
-import com.github.wxiaoqi.security.auth.client.annotation.IgnoreUserToken;
 import com.github.wxiaoqi.security.common.context.BaseContextHandler;
 import com.github.wxiaoqi.security.common.exception.BaseException;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.rest.BaseController;
+import com.github.wxiaoqi.security.common.util.process.ResultCode;
 import com.xxfc.platform.order.biz.OrderMemberDetailBiz;
 import com.xxfc.platform.order.entity.BaseOrder;
 import com.xxfc.platform.order.entity.OrderMemberDetail;
 import com.xxfc.platform.order.pojo.dto.MemberOrderFindDTO;
-import com.xxfc.platform.order.pojo.order.add.AddMemberDTO;
 import com.xxfc.platform.order.pojo.order.MemberBO;
+import com.xxfc.platform.order.pojo.order.add.AddMemberDTO;
 import com.xxfc.platform.order.pojo.vo.MemberOrderPageVo;
 import com.xxfc.platform.order.service.OrderMemberService;
 import io.swagger.annotations.Api;
@@ -25,10 +25,8 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletResponse;
-import java.net.URLEncoder;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
-import java.util.Base64;
 
 @Controller
 @RequestMapping("orderMember")
@@ -60,6 +58,7 @@ public class OrderMemberController extends BaseController<OrderMemberDetailBiz,
         //查询优惠券
         orderMemberService.createOrder(bo);
         return ObjectRestResponse.succ(bo.getOrder());
+        //return ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE, "为了更好地为您提供会员服务，请联系在线客服（或拨打客服电话：4000-369-369）");
     }
 
     /**

xx-order/xx-order-server/src/main/resources/logback.xml

@@ -22,7 +22,7 @@
 		<filter class="com.github.wxiaoqi.security.common.filter.DenyFilter"></filter>
 		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
 			<FileNamePattern>${LOG_HOME}/sys.%d{yyyy-MM-dd}.log</FileNamePattern><!--日志文件输出的文件名 -->
-			<MaxHistory>30</MaxHistory><!--日志文件保留天数 -->
+			<MaxHistory>60</MaxHistory><!--日志文件保留天数 -->
 		</rollingPolicy>
 		<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
 			<Pattern>${CONSOLE_LOG_PATTERN}</Pattern><!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符 -->
@@ -33,7 +33,7 @@
 		<filter class="com.github.wxiaoqi.security.common.filter.AcceptFilter"></filter>
 		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
 			<FileNamePattern>${LOG_HOME}/log.%d{yyyy-MM-dd}.log</FileNamePattern><!--日志文件输出的文件名 -->
-			<MaxHistory>30</MaxHistory><!--日志文件保留天数 -->
+			<MaxHistory>60</MaxHistory><!--日志文件保留天数 -->
 		</rollingPolicy>
 		<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
 			<Pattern>${CONSOLE_LOG_PATTERN}</Pattern><!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符 -->

xx-summit/xx-summit-server/src/main/resources/logback.xml

@@ -22,7 +22,7 @@
 		<filter class="com.github.wxiaoqi.security.common.filter.DenyFilter"></filter>
 		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
 			<FileNamePattern>${LOG_HOME}/sys.%d{yyyy-MM-dd}.log</FileNamePattern><!--日志文件输出的文件名 -->
-			<MaxHistory>30</MaxHistory><!--日志文件保留天数 -->
+			<MaxHistory>60</MaxHistory><!--日志文件保留天数 -->
 		</rollingPolicy>
 		<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
 			<Pattern>${CONSOLE_LOG_PATTERN}</Pattern><!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符 -->
@@ -33,7 +33,7 @@
 		<filter class="com.github.wxiaoqi.security.common.filter.AcceptFilter"></filter>
 		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
 			<FileNamePattern>${LOG_HOME}/log.%d{yyyy-MM-dd}.log</FileNamePattern><!--日志文件输出的文件名 -->
-			<MaxHistory>30</MaxHistory><!--日志文件保留天数 -->
+			<MaxHistory>60</MaxHistory><!--日志文件保留天数 -->
 		</rollingPolicy>
 		<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
 			<Pattern>${CONSOLE_LOG_PATTERN}</Pattern><!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符 -->

xx-tour/xx-tour-server/src/main/resources/logback.xml

@@ -22,7 +22,7 @@
         <filter class="com.github.wxiaoqi.security.common.filter.DenyFilter"></filter>
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
             <FileNamePattern>${LOG_HOME}/sys.%d{yyyy-MM-dd}.log</FileNamePattern><!--日志文件输出的文件名 -->
-            <MaxHistory>30</MaxHistory><!--日志文件保留天数 -->
+            <MaxHistory>60</MaxHistory><!--日志文件保留天数 -->
         </rollingPolicy>
         <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
             <Pattern>${CONSOLE_LOG_PATTERN}</Pattern><!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符 -->
@@ -33,7 +33,7 @@
         <filter class="com.github.wxiaoqi.security.common.filter.AcceptFilter"></filter>
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
             <FileNamePattern>${LOG_HOME}/log.%d{yyyy-MM-dd}.log</FileNamePattern><!--日志文件输出的文件名 -->
-            <MaxHistory>30</MaxHistory><!--日志文件保留天数 -->
+            <MaxHistory>60</MaxHistory><!--日志文件保留天数 -->
         </rollingPolicy>
         <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
             <Pattern>${CONSOLE_LOG_PATTERN}</Pattern><!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符 -->

xx-uccn/xx-uccn-server/src/main/java/com/xxfc/platform/uccn/rest/VehicleModelController.java

@@ -26,6 +26,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletRequest;
 import java.util.Comparator;
 import java.util.List;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 @RestController
@@ -51,7 +52,11 @@ public class VehicleModelController extends CommonBaseController {
         ObjectRestResponse<VModelDetailVO> objectRestResponse = vehicleFeign.detailByParam(BeanUtil.beanToMap(new VehicleModel(){{
             setName(name);
         }}, false, true));
-        objectRestResponse.getData().setUccnCataList(initUccnCataCollect(objectRestResponse.getData().getConfig()));
+        VModelDetailVO data = objectRestResponse.getData();
+        if (Objects.isNull(data)) {
+            return ObjectRestResponse.succ();
+        }
+        objectRestResponse.getData().setUccnCataList(initUccnCataCollect(data.getConfig()));
         return objectRestResponse;
     }
 
@@ -63,7 +68,11 @@ public class VehicleModelController extends CommonBaseController {
         ObjectRestResponse<VModelDetailVO> objectRestResponse = vehicleFeign.detailByParam(BeanUtil.beanToMap(new VehicleModel(){{
             setId(id);
         }}, false, true));
-        objectRestResponse.getData().setUccnCataList(initUccnCataCollect(objectRestResponse.getData().getConfig()));
+        VModelDetailVO data = objectRestResponse.getData();
+        if (Objects.isNull(data)) {
+            return ObjectRestResponse.succ();
+        }
+        objectRestResponse.getData().setUccnCataList(initUccnCataCollect(data.getConfig()));
         return objectRestResponse;
     }
 

xx-uccn/xx-uccn-server/src/main/resources/logback.xml

@@ -22,7 +22,7 @@
         <filter class="com.github.wxiaoqi.security.common.filter.DenyFilter"></filter>
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
             <FileNamePattern>${LOG_HOME}/sys.%d{yyyy-MM-dd}.log</FileNamePattern><!--日志文件输出的文件名 -->
-            <MaxHistory>30</MaxHistory><!--日志文件保留天数 -->
+            <MaxHistory>60</MaxHistory><!--日志文件保留天数 -->
         </rollingPolicy>
         <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
             <Pattern>${CONSOLE_LOG_PATTERN}</Pattern><!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符 -->
@@ -33,7 +33,7 @@
         <filter class="com.github.wxiaoqi.security.common.filter.AcceptFilter"></filter>
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
             <FileNamePattern>${LOG_HOME}/log.%d{yyyy-MM-dd}.log</FileNamePattern><!--日志文件输出的文件名 -->
-            <MaxHistory>30</MaxHistory><!--日志文件保留天数 -->
+            <MaxHistory>60</MaxHistory><!--日志文件保留天数 -->
         </rollingPolicy>
         <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
             <Pattern>${CONSOLE_LOG_PATTERN}</Pattern><!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符 -->

xx-universal/xx-universal-server/src/main/resources/logback.xml

@@ -22,7 +22,7 @@
 		<filter class="com.github.wxiaoqi.security.common.filter.DenyFilter"></filter>
 		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
 			<FileNamePattern>${LOG_HOME}/sys.%d{yyyy-MM-dd}.log</FileNamePattern><!--日志文件输出的文件名 -->
-			<MaxHistory>30</MaxHistory><!--日志文件保留天数 -->
+			<MaxHistory>60</MaxHistory><!--日志文件保留天数 -->
 		</rollingPolicy>
 		<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
 			<Pattern>${CONSOLE_LOG_PATTERN}</Pattern><!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符 -->
@@ -33,7 +33,7 @@
 		<filter class="com.github.wxiaoqi.security.common.filter.AcceptFilter"></filter>
 		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
 			<FileNamePattern>${LOG_HOME}/log.%d{yyyy-MM-dd}.log</FileNamePattern><!--日志文件输出的文件名 -->
-			<MaxHistory>30</MaxHistory><!--日志文件保留天数 -->
+			<MaxHistory>60</MaxHistory><!--日志文件保留天数 -->
 		</rollingPolicy>
 		<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
 			<Pattern>${CONSOLE_LOG_PATTERN}</Pattern><!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符 -->

xx-user-behavior-collect/xx-user-behavior-server/src/main/resources/logback.xml

@@ -22,7 +22,7 @@
         <filter class="com.github.wxiaoqi.security.common.filter.DenyFilter"></filter>
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
             <FileNamePattern>${LOG_HOME}/sys.%d{yyyy-MM-dd}.log</FileNamePattern><!--日志文件输出的文件名 -->
-            <MaxHistory>30</MaxHistory><!--日志文件保留天数 -->
+            <MaxHistory>60</MaxHistory><!--日志文件保留天数 -->
         </rollingPolicy>
         <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
             <Pattern>${CONSOLE_LOG_PATTERN}</Pattern><!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符 -->
@@ -33,7 +33,7 @@
         <filter class="com.github.wxiaoqi.security.common.filter.AcceptFilter"></filter>
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
             <FileNamePattern>${LOG_HOME}/log.%d{yyyy-MM-dd}.log</FileNamePattern><!--日志文件输出的文件名 -->
-            <MaxHistory>30</MaxHistory><!--日志文件保留天数 -->
+            <MaxHistory>60</MaxHistory><!--日志文件保留天数 -->
         </rollingPolicy>
         <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
             <Pattern>${CONSOLE_LOG_PATTERN}</Pattern><!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符 -->

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/jobhandler/VehicleJobHandler.java

 package com.xxfc.platform.vehicle.jobhandler;
 
+import cn.hutool.core.util.StrUtil;
 import com.xxfc.platform.universal.entity.Dictionary;
 import com.xxfc.platform.universal.feign.ThirdFeign;
 import com.xxfc.platform.vehicle.biz.VehicleBiz;
@@ -46,6 +47,9 @@ public class VehicleJobHandler extends IJobHandler {
             List<String> existVehicleIds = vehicleBiz.findExistVehicleIds();
             Dictionary dictionary = thirdFeign.findDictionaryByTypeAndCode(DIC_VEHICLE_TYPE, DIC_VEHICLE_CODE);
             LocalDate date = LocalDate.now();
+            if(StrUtil.isNotBlank(s)) {
+                date = LocalDate.parse(s);
+            }
             date = date.plusMonths(Integer.valueOf(dictionary.getDetail()));
             int year = date.getYear();
             int month = date.getMonthValue();

xx-vehicle/xx-vehicle-server/src/main/resources/logback.xml

@@ -22,7 +22,7 @@
 		<filter class="com.github.wxiaoqi.security.common.filter.DenyFilter"></filter>
 		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
 			<FileNamePattern>${LOG_HOME}/sys.%d{yyyy-MM-dd}.log</FileNamePattern><!--日志文件输出的文件名 -->
-			<MaxHistory>30</MaxHistory><!--日志文件保留天数 -->
+			<MaxHistory>60</MaxHistory><!--日志文件保留天数 -->
 		</rollingPolicy>
 		<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
             <Pattern>${CONSOLE_LOG_PATTERN}</Pattern><!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符 -->
@@ -33,7 +33,7 @@
 		<filter class="com.github.wxiaoqi.security.common.filter.AcceptFilter"></filter>
 		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
 			<FileNamePattern>${LOG_HOME}/log.%d{yyyy-MM-dd}.log</FileNamePattern><!--日志文件输出的文件名 -->
-			<MaxHistory>30</MaxHistory><!--日志文件保留天数 -->
+			<MaxHistory>60</MaxHistory><!--日志文件保留天数 -->
 		</rollingPolicy>
 		<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
             <Pattern>${CONSOLE_LOG_PATTERN}</Pattern><!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符 -->