Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/aop/ControllerAop.java

@@ -64,7 +64,7 @@ public class ControllerAop {
         ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
         HttpServletRequest request = attributes.getRequest();
         // 不需要添加请求头的接口
-        String[] url = new String[]{"/api/user/selectInfo", "/api/user/save/curCompany", "/jcs/command/lookHtmlText", "/jcs/common/duty-person/findByDutyAreaId", "/tzs/wechatBack", "/tzs/wechat-relation/save","/tzs/alert-called/saveMobile","/tzs/elevator/getElevatorInfo"};
+        String[] url = new String[]{"/api/user/selectInfo", "/api/user/save/curCompany", "/jcs/command/lookHtmlText", "/jcs/common/duty-person/findByDutyAreaId", "/tzs/wechatBack", "/tzs/alert-called/saveMobile","/tzs/elevator/getElevatorInfo"};
         // 获取请求路径
         for(String uri : url) {
             if(request.getRequestURI().indexOf(uri) != -1) {

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/FirefightersMapper.java

@@ -34,5 +34,5 @@ public interface FirefightersMapper extends BaseMapper<Firefighters> {
 
     List<FirefightersExcelDto> exportToExcel(Boolean isDelete);
 
-    List<String> getFirefightersName(String contactName);
+    List<String> getFirefightersName( );
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/KeySiteMapper.java

@@ -36,6 +36,6 @@ public KeySiteDto getSequenceNbr(Long sequenceNbr);
 
 
 public  List<KeySiteDateDto> getKeySiteDate(Long id);
-public List<String> getAddress(String address);
+public List<String> getAddress();
 
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/FireTeamMapper.xml

@@ -99,7 +99,7 @@
         a.name ,
         a.contact_user contactUser,
         a.contact_phone contactPhone,
-        ( SELECT count( 1 ) FROM cb_firefighters WHERE fire_team_id = a.sequence_n  br AND is_delete = 0 ) userNum,
+        ( SELECT count( 1 ) FROM cb_firefighters WHERE fire_team_id = a.sequence_nbr AND is_delete = 0 ) userNum,
         Round(st_distance(point(a.longitude,a.latitude),point(#{par.longitude},#{par.latitude}))*111195,1) AS distance
         FROM cb_fire_team a
         where  a.is_delete=0 and a.longitude is not null and a.latitude   is not null

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/FirefightersMapper.xml

@@ -159,13 +159,14 @@ AND fp.is_delete = 0
 
 	<select id="getFirefightersName" resultType="string">
 		SELECT
-		       a.name
+			cb_firefighters.name
 		FROM
-		     cb_firefighters a
+			cb_firefighters
 		WHERE
-		      a.is_delete =0
-		  and
-		      a.name like concat ('%',#{contactName},'%')
+			cb_firefighters.is_delete = 0 AND
+			cb_firefighters.name IS NOT NULL AND
+			cb_firefighters.name != ''
+		group by cb_firefighters.name
 	</select>
 
 </mapper>

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/KeySiteMapper.xml

@@ -138,10 +138,14 @@
 
 	<select id="getAddress" resultType="string">
 		SELECT
-		c.address_desc
-		FROM cb_key_site c
-		where c.is_delete = FALSE
-		and
-		c.address_desc like concat ('%',#{address},'%');
+			cb_key_site.address_desc
+		FROM
+			cb_key_site
+		WHERE
+			cb_key_site.is_delete = FALSE AND
+			cb_key_site.address_desc IS NOT NULL AND
+			cb_key_site.address_desc != ''
+		GROUP BY
+			cb_key_site.address_desc
 	</select>
 </mapper>

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/mapper/AlertCalledMapper.java

@@ -36,9 +36,9 @@ public interface AlertCalledMapper extends BaseMapper<AlertCalled> {
 
     List<AlertCalledTodyDto> getTodayAlertCalled();
 
-    List<String> getContactName(String contactName);
+    List<String> getContactName( );
 
-    List<String> getAddress(String address);
+    List<String> getAddress();
 
     List<AlertCalled> selectAllPage(Long current, Long size,
                                     Integer alertStatus,

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/resources/mapper/AlertCalledMapper.xml

@@ -190,24 +190,28 @@
 
     <select id="getContactName" resultType="string">
         SELECT
-            a.contact_user
+            jc_alert_called.contact_user
         FROM
-            jc_alert_called a
+            jc_alert_called
         WHERE
-            a.is_delete =0
-          and
-            a.contact_user like concat ('%',#{contactName},'%')
+            jc_alert_called.is_delete = 0 AND
+            jc_alert_called.contact_user IS NOT NULL AND
+            jc_alert_called.contact_user != ''
+        GROUP BY
+            jc_alert_called.contact_user
     </select>
 
     <select id="getAddress" resultType="string">
         SELECT
-            a.address
+            jc_alert_called.address
         FROM
-            jc_alert_called a
+            jc_alert_called
         WHERE
-            a.is_delete =0
-          and
-            a.address like concat ('%',#{address},'%')
+            jc_alert_called.is_delete =0 AND
+            jc_alert_called.address IS NOT NULL AND
+            jc_alert_called.address != ''
+        GROUP BY
+            jc_alert_called.address
     </select>
 
      <!--  未结束警情列表  -->

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/dto/WechatAccessDto.java

@@ -25,4 +25,13 @@ public class WechatAccessDto {
 
     @ApiModelProperty(value = "用户性别")
     private String sex;
+
+    @ApiModelProperty(value = "token信息")
+    private String token;
+
+    @ApiModelProperty(value = "product")
+    private String product;
+
+    @ApiModelProperty(value = "appKey")
+    private String appKey;
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/dto/WechatRelationDto.java

@@ -29,4 +29,7 @@ public class WechatRelationDto  {
     @ApiModelProperty(value = "验证码")
     private String code;
 
+    @ApiModelProperty(value = "amos 用户id")
+    private String userId;
+
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/entity/WechatRelation.java

@@ -4,11 +4,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import java.util.Date;
 
 /**
  * 微信公众号openid与电话号对应关系表
@@ -38,4 +35,11 @@ public class WechatRelation  {
 	@TableField("phone")
     private String phone;
 
+
+    /**
+     * amos 用户id
+     */
+    @TableField("user_id")
+    private String userId;
+
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/FirefightersServiceImpl.java

@@ -103,9 +103,9 @@ public class FirefightersServiceImpl extends BaseService<FirefightersDto, Firefi
     }
 
 
-    public List<String> getFirefightersName(String contactName) {
+    public List<String> getFirefightersName( ) {
 
-     return     firefightersMapper.getFirefightersName(contactName);
+     return     firefightersMapper.getFirefightersName();
 
     }
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/KeySiteServiceImpl.java

@@ -312,7 +312,7 @@ public class KeySiteServiceImpl extends BaseService<KeySiteDto, KeySite, KeySite
 
 
 
-	public List<String> getAddress(String address){
-	 return 	keySiteMapper.getAddress(address);
+	public List<String> getAddress(){
+	 return 	keySiteMapper.getAddress();
 	}
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/AlertCalledController.java

@@ -344,9 +344,9 @@ public class AlertCalledController extends BaseController {
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/getAmosId", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "警情填报联系人模糊查询", notes = "警情填报联系人模糊查询")
-    public List<String> getContact (String contactName) {
+    public ResponseModel< List<String>> getContact ( ) {
 
-        return iAlertCalledService.getContactName(contactName);
+        return ResponseHelper.buildResponse(iAlertCalledService.getContactName());
     }
 
     /**
@@ -358,9 +358,9 @@ public class AlertCalledController extends BaseController {
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/getAddress", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "警情填报地址模糊查询", notes = "警情填报地址模糊查询")
-    public List<String> getAddress (String address) {
+    public ResponseModel<List<String>> getAddress () {
 
-        return iAlertCalledService.getCalledAddress(address);
+        return ResponseHelper.buildResponse(iAlertCalledService.getCalledAddress());
     }
     /*2304 地址 联系人模糊查询缺失  陈召 2021-09-23 结束*/
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/AlertCalledServiceImpl.java

 package com.yeejoin.amos.boot.module.jcs.biz.service.impl;
 
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
@@ -783,17 +779,19 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto, AlertCal
         return resultList;
     }
     /*2304 地址 联系人模糊查询缺失  陈召 2021-09-23 开始*/
-    public List<String> getContactName(String contactName){
-        List<String> firefightersName = firefightersService.getFirefightersName(contactName);
-        List<String> contactNames = alertCalledMapper.getContactName(contactName);
+    public List<String>  getContactName( ){
+        List<String> firefightersName = firefightersService.getFirefightersName();
+        List<String> contactNames = alertCalledMapper.getContactName();
         firefightersName.addAll(contactNames);
+
       return firefightersName;
     }
 
-    public List<String> getCalledAddress(String address){
-        List<String> keyAddress = keySiteService.getAddress(address);
-        List<String> alertAddress = alertCalledMapper.getAddress(address);
+    public  List<String> getCalledAddress( ){
+        List<String> keyAddress = keySiteService.getAddress();
+        List<String> alertAddress = alertCalledMapper.getAddress();
         keyAddress.addAll(alertAddress);
+
         return keyAddress;
     }
     /*2304 地址 联系人模糊查询缺失  陈召 2021-09-23 结束*/

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/controller/PlanAuditController.java

@@ -4,6 +4,7 @@ import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.supervision.business.service.intfc.IPlanAuditService;
 import com.yeejoin.amos.supervision.business.util.CommonResponse;
 import com.yeejoin.amos.supervision.business.util.CommonResponseUtil;
+import com.yeejoin.amos.supervision.core.framework.PersonIdentify;
 import com.yeejoin.amos.supervision.dao.entity.PlanAuditLog;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -26,6 +27,7 @@ public class PlanAuditController extends AbstractBaseController {
     private IPlanAuditService planAuditService;
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PersonIdentify
     @ApiOperation(value = "计划工作流审核", notes = "计划工作流审核")
     @RequestMapping(value = "/auditWorkFlow", produces = "application/json;charset=UTF-8", method = RequestMethod.POST)
     public CommonResponse auditWorkFlow(

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/controller/WechatController.java

@@ -9,6 +9,7 @@ import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.tzs.api.dto.WechatAccessDto;
 import com.yeejoin.amos.boot.module.tzs.api.dto.WechatMyTaskDto;
 import com.yeejoin.amos.boot.module.tzs.api.dto.WechatMyTaskListDto;
+import com.yeejoin.amos.boot.module.tzs.api.dto.WechatRelationDto;
 import com.yeejoin.amos.boot.module.tzs.api.entity.AlertFormValue;
 import com.yeejoin.amos.boot.module.tzs.api.entity.WechatRelation;
 import com.yeejoin.amos.boot.module.tzs.api.service.IDispatchTaskService;
@@ -17,6 +18,10 @@ import com.yeejoin.amos.boot.module.tzs.biz.service.impl.AlertFormValueServiceIm
 import com.yeejoin.amos.boot.module.tzs.biz.service.impl.WechatRelationServiceImpl;
 import com.yeejoin.amos.boot.module.tzs.biz.utils.HttpUtils;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
+import com.yeejoin.amos.feign.privilege.Privilege;
+import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
+import com.yeejoin.amos.feign.privilege.model.IdPasswordAuthModel;
+import com.yeejoin.amos.feign.privilege.util.DesUtil;
 import com.yeejoin.amos.feign.systemctl.Systemctl;
 import com.yeejoin.amos.feign.systemctl.model.SmsRecordModel;
 import io.swagger.annotations.Api;
@@ -25,6 +30,7 @@ import io.swagger.annotations.ApiParam;
 import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -216,20 +222,78 @@ public class WechatController extends BaseController {
 	@ApiOperation(httpMethod = "GET", value = "根据手机号发送短信验证码", notes = "根据手机号发送短信验证码")
 	public ResponseModel<Boolean> sendSmsCode(@PathVariable String tel) {
 		Boolean flag = false;
-		String code = getrandom();
 		HashMap<String, String>  params = new HashMap<>();
-		params.put("smsCode","SMS_TZS_0001");
+		params.put("smsType","MOBILE_REGISTER");
 		params.put("mobile",tel);
-		params.put("code",code);
-		FeignClientResult<SmsRecordModel> result = Systemctl.smsClient.sendCommonSms(params);
-		if(result.getStatus() == 200) {
-			flag = true;
-			// code 保存在redis中 设置10分钟过期时间
-			redisUtils.set("tel_code_" + tel, code,time);
-		}
+		FeignClientResult<SmsRecordModel> result = Systemctl.smsClient.sendVerifyCode(params);
 		return ResponseHelper.buildResponse(flag);
 	}
 
+	/**
+	 * 新增微信公众号openid与电话号对应关系表
+	 *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+	@PostMapping(value = "/addUser")
+	@ApiOperation(httpMethod = "POST", value = "新增微信公众号openid与电话号对应关系表", notes = "新增微信公众号openid与电话号对应关系表")
+	@Transactional
+	public ResponseModel<WechatAccessDto> addUser(@RequestBody WechatRelationDto model) {
+		if (ValidationUtil.isEmpty(model.getOpenId())
+				|| ValidationUtil.isEmpty(model.getPhone())
+				|| ValidationUtil.isEmpty(model.getCode()))
+			throw new BadRequest("参数校验失败.");
+		AgencyUserModel agencyUserModel = new AgencyUserModel();
+		String passwd = DesUtil.encode("a_"+model.getPhone(), "qaz");
+		agencyUserModel.setUserName(model.getPhone());
+		agencyUserModel.setRealName(model.getPhone());
+		agencyUserModel.setLockStatus("UNLOCK");
+		agencyUserModel.setPassword(passwd);
+		agencyUserModel.setRePassword(passwd);
+		agencyUserModel.setAgencyCode("tzs");
+		agencyUserModel.setMobile(model.getPhone());
+		agencyUserModel.setVerifyCode(model.getCode());
+		FeignClientResult<AgencyUserModel> result = Privilege.agencyUserClient.mobileRegister(agencyUserModel);
+		agencyUserModel = result.getResult();
+		if(agencyUserModel != null && StringUtils.isNotBlank(agencyUserModel.getUserId())) {
+			model.setUserId(agencyUserModel.getUserId());
+			wechatRelationServiceImpl.createWithModel(model);
+		} else {
+			throw new BadRequest("注册失败");
+		}
+		WechatAccessDto dto = new WechatAccessDto();
+		dto.setOpenId(model.getOpenId());
+		dto.setTel(model.getPhone());
+		IdPasswordAuthModel loninData = new IdPasswordAuthModel();
+		loninData.setLoginId(model.getPhone());
+		loninData.setPassword(passwd);
+		FeignClientResult loginResult = Privilege.authClient.idpassword(loninData);
+		if(loginResult.getStatus() == 200) {
+			HashMap resultMap = (HashMap) loginResult.getResult();
+			dto.setToken(resultMap.get("token").toString());
+			redisUtils.set(model.getPhone() + "_token",  resultMap.get("token").toString(), 25920000l);
+		}
+
+		return ResponseHelper.buildResponse(dto);
+	}
+
+
+
+	public String login(String tel) {
+		String token = "";
+		IdPasswordAuthModel loninData = new IdPasswordAuthModel();
+		loninData.setLoginId(tel);
+		String passwd = DesUtil.encode("a_" + tel, "qaz");
+		loninData.setPassword(passwd);
+		FeignClientResult loginResult = Privilege.authClient.idpassword(loninData);
+		if(loginResult.getStatus() == 200) {
+			HashMap resultMap = (HashMap) loginResult.getResult();
+			token =  resultMap.get("token").toString();
+			redisUtils.set(tel + "_token",   resultMap.get("token").toString(), 25920000l);
+		}
+		return token;
+	}
+
 
 	/**
 	 * 根据微信code获取openId和手机号接口
@@ -252,6 +316,11 @@ public class WechatController extends BaseController {
 			WechatRelation temp = wechatRelationServiceImpl.getOne(new LambdaQueryWrapper<WechatRelation>().eq(WechatRelation::getOpenId,openId));
 			if(temp != null ) {
 				wechatAccessDto.setTel(temp.getPhone());
+				if(redisUtils.hasKey(temp.getPhone() + "_token")) {
+					wechatAccessDto.setToken(redisUtils.get(temp.getPhone() + "_token").toString());
+				} else {
+					wechatAccessDto.setToken(this.login(temp.getPhone()));
+				}
 			}
 		}
 		return ResponseHelper.buildResponse(wechatAccessDto);

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/controller/WechatRelationController.java

 package com.yeejoin.amos.boot.module.tzs.biz.controller;
 
-import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
-import org.springframework.web.bind.annotation.RequestMapping;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.Api;
-import org.springframework.web.bind.annotation.RestController;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
-import java.util.List;
 import com.yeejoin.amos.boot.module.tzs.biz.service.impl.WechatRelationServiceImpl;
-import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
-import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
-import org.typroject.tyboot.core.restful.utils.ResponseHelper;
-import org.typroject.tyboot.core.restful.utils.ResponseModel;
+import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
-import javax.servlet.http.HttpServletRequest;
-import org.springframework.web.bind.annotation.*;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yeejoin.amos.boot.module.tzs.api.dto.WechatRelationDto;
-import org.typroject.tyboot.core.restful.doc.TycloudOperation;
-import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * 微信公众号openid与电话号对应关系表
@@ -35,29 +22,5 @@ public class WechatRelationController extends BaseController {
     WechatRelationServiceImpl wechatRelationServiceImpl;
 
 
-	@Autowired
-	RedisUtils redisUtils;
-
-    /**
-     * 新增微信公众号openid与电话号对应关系表
-     *
-     * @return
-     */
-    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
-	@PostMapping(value = "/save")
-	@ApiOperation(httpMethod = "POST", value = "新增微信公众号openid与电话号对应关系表", notes = "新增微信公众号openid与电话号对应关系表")
-	public ResponseModel<WechatRelationDto> save(@RequestBody WechatRelationDto model) {
-		if (ValidationUtil.isEmpty(model.getOpenId())
-				|| ValidationUtil.isEmpty(model.getPhone())
-				|| ValidationUtil.isEmpty(model.getCode()))
-			throw new BadRequest("参数校验失败.");
-    	if(!model.getCode().equals(redisUtils.get("tel_code_" + model.getPhone()))) {
-			throw new BadRequest("验证码验证失败!");
-		}
-	    model = wechatRelationServiceImpl.createWithModel(model);
-	    return ResponseHelper.buildResponse(model);
-	}
-
-
 
 }

amos-boot-system-fas/src/main/resources/application-jcs.properties

+#DB properties:
+spring.datasource.url=jdbc:mysql://11.11.16.4:3306/xiy_safety_business_v3.0.1_20100712?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
+spring.datasource.username=root
+spring.datasource.password=Yeejoin@2020
+spring.datasource.driver-class-name = com.mysql.cj.jdbc.Driver
+spring.datasource.hikari.maxLifetime = 1765000
+spring.datasource.hikari.maximum-pool-size = 10
+spring.datasource.testWhileIdle = true
+spring.datasource.validationQuery = SELECT 1
+
+#系统服务账号，用户后端服务调用
+security.password=a1234560
+security.loginId=jc_fas_autosys
+
+#应用product appkey
+security.productWeb=STUDIO_APP_WEB
+security.appKey =studio_normalapp_2681691
+
+eureka.client.serviceUrl.defaultZone=http://11.11.16.1:10001/eureka/
+eureka.client.registry-fetch-interval-seconds=5
+eureka.instance.prefer-ip-address=true
+management.endpoint.health.show-details=always
+management.endpoints.web.exposure.include=*
+eureka.instance.health-check-url-path=/actuator/health
+eureka.instance.lease-expiration-duration-in-seconds=10
+eureka.instance.lease-renewal-interval-in-seconds=5
+eureka.instance.metadata-map.management.context-path=${server.servlet.context-path}/actuator
+eureka.instance.status-page-url-path=/actuator/info
+eureka.instance.metadata-map.management.api-docs=http://11.11.16.1:${server.port}${server.servlet.context-path}/doc.html
+
+
+#redis
+spring.redis.database=1
+spring.redis.host=11.11.16.1
+spring.redis.port=6379
+spring.redis.password=yeejoin@2020
+spring.redis.jedis.pool.max-active=200
+spring.redis.jedis.pool.max-wait=-1
+spring.redis.jedis.pool.max-idle=10
+spring.redis.jedis.pool.min-idle=0
+spring.redis.timeout=1000
+#picture upload
+windows.img.path = C:\\
+linux.img.path = /
+file.uploadUrl=C:\\upload\\files\\
+#picture read
+file.readUrl=http://11.11.16.1:8085/file/getFile?in=
+
+#jpush 推送开关
+params.isPush=false
+## emqx
+emqx.clean-session=true
+emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
+emqx.broker=tcp://11.11.16.1:2883
+emqx.user-name=super
+emqx.password=a123456
+#文件服务器地址
+file.url=http://11.11.16.1:9000/
+

amos-boot-system-fas/src/main/resources/logback-jcs.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<configuration debug="false">
+    <!--定义日志文件的存储地址 勿在 LogBack 的配置中使用相对路径-->
+    <property name="LOG_HOME" value="log" />
+    <!-- 按照每天生成日志文件 -->
+    <appender name="FILE"  class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <!--日志文件输出的文件名-->
+            <FileNamePattern>${LOG_HOME}/fas.log.%d{yyyy-MM-dd}.%i.log</FileNamePattern>
+            <!--日志文件保留天数-->
+            <MaxHistory>30</MaxHistory>
+            <!--日志文件大小-->
+            <MaxFileSize>30mb</MaxFileSize>
+        </rollingPolicy>
+        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+            <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+        </encoder>
+    </appender>
+    <!-- 控制台输出 -->
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+            <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+        </encoder>
+    </appender>
+    <!--    show parameters for hibernate sql 专为 Hibernate 定制
+    <logger name="org.hibernate.type.descriptor.sql.BasicBinder"  level="TRACE" />
+    <logger name="org.hibernate.type.descriptor.sql.BasicExtractor"  level="DEBUG" />
+    <logger name="org.hibernate.SQL" level="DEBUG" />
+    <logger name="org.hibernate.engine.QueryParameters" level="DEBUG" />
+    <logger name="org.hibernate.engine.query.HQLQueryPlan" level="DEBUG" />
+    -->
+    <!--myibatis log configure-->
+    <logger name="com.apache.ibatis" level="DEBUG"/>
+    <logger name="org.mybatis" level="DEBUG" />
+    <logger name="java.sql.Connection" level="DEBUG"/>
+    <logger name="java.sql.Statement" level="DEBUG"/>
+    <logger name="java.sql.PreparedStatement" level="DEBUG"/>
+    <logger name="org.springframework" level="DEBUG"/>
+
+    <!-- 日志输出级别 -->
+    <root level="DEBUG">
+        <appender-ref ref="FILE" />
+        <appender-ref ref="STDOUT" />
+    </root>
+</configuration>
\ No newline at end of file

amos-boot-system-jcs/src/main/resources/application-jcs.properties

+## DB properties:
+spring.datasource.url=jdbc:mysql://11.11.16.4:3306/xiy_bootsystem_jcs_v1.0.0.1_20210729?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
+spring.datasource.username=root
+spring.datasource.password=Yeejoin@2020
+
+## eureka properties:
+eureka.client.serviceUrl.defaultZone=http://11.11.16.1:10001/eureka/
+
+## redis properties:
+spring.redis.database=1
+spring.redis.host=11.11.16.1
+spring.redis.port=6379
+spring.redis.password=yeejoin@2020
+
+## ES properties:
+biz.elasticsearch.address=11.11.16.1
+spring.data.elasticsearch.cluster-name=elasticsearch
+spring.data.elasticsearch.cluster-nodes=${biz.elasticsearch.address}:9300
+spring.elasticsearch.rest.uris=http://${biz.elasticsearch.address}:9200
+
+## emqx properties:
+emqx.clean-session=true
+emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
+emqx.broker=tcp://11.11.16.1:2883
+emqx.user-name=super
+emqx.password=a123456
+
+## 规则配置 properties:
+rule.definition.load=false
+rule.definition.model-package=com.yeejoin.amos.boot.module.jcs.api.dto
+rule.definition.default-agency=jcs
+rule.definition.localIp=11.11.16.1
+
+## mongodb properties:
+spring.data.mongodb.uri=mongodb://11.11.16.1:27017/xiy_jcs_bootsystem
+
+## file properties:
+file.url=http://11.11.16.1:9000/
+
+video.url=https://11.11.16.4:443/
+

amos-boot-system-jcs/src/main/resources/db/changelog/jcs-1.0.0.0.xml

@@ -580,6 +580,18 @@
 		</sql>
 	</changeSet>
 
+
+    <changeSet id="2021-09-24" author="cz">
+
+        <preConditions onFail="MARK_RAN">
+            <tableExists tableName="cb_data_dictionary"/>
+        </preConditions>
+        <comment>修改数据库字段type_desc长度</comment>
+        <sql>
+            ALTER TABLE cb_data_dictionary MODIFY COLUMN type_desc VARCHAR(225);
+        </sql>
+    </changeSet>
+
     <changeSet author="chenzhao" id="2021-09-07-chenzhao">
         <preConditions onFail="MARK_RAN">
 
@@ -1507,4 +1519,31 @@
             INSERT INTO `cb_data_dictionary`(`sequence_nbr`, `code`, `name`, `type`, `type_desc`, `parent`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `sort_num`) VALUES (1244, '1244', '119接处警系统', 'SOURCE', NULL, NULL, NULL, NULL, NULL, b'0', 1);
         </sql>
     </changeSet>
-</databaseChangeLog>
+
+
+    <changeSet id="2021-09-24-02" author="cz">
+
+        <preConditions onFail="MARK_RAN">
+            <tableExists tableName="cb_data_dictionary"/>
+        </preConditions>
+        <comment>删除无用数据</comment>
+        <sql>
+            update cb_data_dictionary set type_desc = null where sequence_nbr = 1173 ;
+            update cb_data_dictionary set type_desc = null where sequence_nbr = 1174 ;
+            update cb_data_dictionary set type_desc = null where sequence_nbr = 1175 ;
+            update cb_data_dictionary set type_desc = null where sequence_nbr = 1176 ;
+            update cb_data_dictionary set type_desc = null where sequence_nbr = 1177 ;
+            update cb_data_dictionary set type_desc = null where sequence_nbr = 1178 ;
+            update cb_data_dictionary set type_desc = null where sequence_nbr = 1179 ;
+            update cb_data_dictionary set type_desc = null where sequence_nbr = 1180 ;
+            update cb_data_dictionary set type_desc = null where sequence_nbr = 1181 ;
+            update cb_data_dictionary set type_desc = null where sequence_nbr = 1182 ;
+            update cb_data_dictionary set type_desc = null where sequence_nbr = 1183 ;
+            update cb_data_dictionary set type_desc = null where sequence_nbr = 1184 ;
+            update cb_data_dictionary set type_desc = null where sequence_nbr = 1185 ;
+            update cb_data_dictionary set type_desc = null where sequence_nbr = 1186 ;
+            update cb_data_dictionary set type_desc = null where sequence_nbr = 1187 ;
+            update cb_data_dictionary set type_desc = null where sequence_nbr = 1188 ;
+        </sql>
+    </changeSet>
+        </databaseChangeLog>

amos-boot-system-jcs/src/main/resources/logback-jcs.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<configuration debug="false">
+    <!--定义日志文件的存储地址 勿在 LogBack 的配置中使用相对路径-->
+    <property name="LOG_HOME" value="log" />
+    <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
+    <property name="LOG_PATTERN" value="%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %-50.50logger{50} - %msg [%file:%line] %n" />
+    <!-- 按照每天生成日志文件 -->
+    <appender name="FILE"  class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!--日志文件输出的文件名-->
+            <FileNamePattern>${LOG_HOME}/jcs.log.%d{yyyy-MM-dd}.log</FileNamePattern>
+            <!--日志文件保留天数-->
+            <MaxHistory>7</MaxHistory>
+        </rollingPolicy>
+        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+            <pattern>${LOG_PATTERN}</pattern>
+        </encoder>
+        <!--日志文件最大的大小-->
+        <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
+            <MaxFileSize>30mb</MaxFileSize>
+        </triggeringPolicy>
+    </appender>
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+            <pattern>${LOG_PATTERN}</pattern>
+        </encoder>
+    </appender>
+    <!--myibatis log configure-->
+    <logger name="com.apache.ibatis" level="INFO"/>
+    <logger name="org.mybatis" level="INFO" />
+    <logger name="java.sql.Connection" level="INFO"/>
+    <logger name="java.sql.Statement" level="INFO"/>
+    <logger name="java.sql.PreparedStatement" level="INFO"/>
+    <logger name="com.baomidou.mybatisplus" level="INFO"/>
+
+    <logger name="org.typroject" level="INFO"/>
+    <logger name="com.yeejoin" level="INFO"/>
+    <logger name="org.springframework" level="INFO"/>
+
+
+    <!-- 日志输出级别 -->
+    <root level="INFO">
+        <appender-ref ref="FILE" />
+        <appender-ref ref="STDOUT" />
+    </root>
+</configuration>

amos-boot-system-knowledgebase/src/main/resources/application-jcs.properties

+##\u5F00\u53D1\u73AF\u5883\u914D\u7F6E\u6587\u4EF6
+# jdbc_config
+spring.datasource.url=jdbc:mysql://11.11.16.4:3306/xiy_knowledge_v3.0.1_20210712?characterEncoding=utf8&serverTimezone=Asia/Shanghai
+spring.datasource.username=root
+spring.datasource.password=Yeejoin@2020
+spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
+#not support for spring-boot v1.5+, use org.apache.tomcat.jdbc.pool.DataSource by default.
+spring.datasource.type=com.zaxxer.hikari.HikariDataSource
+spring.datasource.hikari.minimum-idle=5
+spring.datasource.hikari.maximum-pool-size=15
+spring.datasource.hikari.auto-commit=true
+spring.datasource.hikari.idle-timeout=30000
+spring.datasource.hikari.pool-name=DatebookHikariCP
+spring.datasource.hikari.max-lifetime=1800000
+spring.datasource.hikari.connection-timeout=30000
+spring.datasource.hikari.connection-test-query=SELECT 1
+
+
+
+# REDIS (RedisProperties)
+spring.redis.database=1
+spring.redis.host=11.11.16.1
+spring.redis.port=6379
+spring.redis.password=yeejoin@2020
+spring.redis.timeout=0
+
+
+#\u6CE8\u518C\u4E2D\u5FC3\u5730\u5740
+eureka.client.service-url.defaultZone =http://11.11.16.1:10001/eureka/
+eureka.instance.prefer-ip-address=true
+management.endpoint.health.show-details=always
+management.endpoints.web.exposure.include=*
+eureka.instance.health-check-url=http://11.11.16.1:${server.port}${server.servlet.context-path}/actuator/health
+eureka.instance.metadata-map.management.context-path=${server.servlet.context-path}/actuator
+eureka.instance.status-page-url=http://11.11.16.1:${server.port}${server.servlet.context-path}/actuator/info
+eureka.instance.metadata-map.management.api-docs=http://11.11.16.1:${server.port}${server.servlet.context-path}/swagger-ui.html
+
+
+#ES
+spring.data.elasticsearch.cluster-name=docker-cluster
+spring.data.elasticsearch.cluster-nodes=11.11.16.1:9300
+spring.elasticsearch.rest.uris=http://11.11.16.1:9200
+
+
+#emqx v4.0
+emqx.clean-session=true
+emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
+emqx.broker=tcp://11.11.16.1:2883
+emqx.user-name=knowledge
+emqx.password=a123456
+emqx.max-inflight=1000
+
+#DIY
+diy-config.report.record-data=false
+
+#pic server uri
+pic-server.uri=http://11.11.16.1:9000/
+#pic router mark
+pic-server.router=/fileURI/

amos-boot-system-knowledgebase/src/main/resources/logback-jcs.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<configuration debug="false">
+    <!--定义日志文件的存储地址 勿在 LogBack 的配置中使用相对路径-->
+    <property name="LOG_HOME" value="log"/>
+    <!-- 按照每天生成日志文件 -->
+    <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!--日志文件输出的文件名-->
+            <FileNamePattern>${LOG_HOME}/knowledgebase.%d{yyyy-MM-dd}.%i.log</FileNamePattern>
+            <!--日志文件保留天数-->
+            <MaxHistory>30</MaxHistory>
+            <!--按大小分割同一天的-->
+            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>100MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+        </rollingPolicy>
+        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+            <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+        </encoder>
+
+    </appender>
+    <!--    show parameters for hibernate sql 专为 Hibernate 定制
+    <logger name="org.hibernate.type.descriptor.sql.BasicBinder"  level="TRACE" />
+    <logger name="org.hibernate.type.descriptor.sql.BasicExtractor"  level="DEBUG" />
+    <logger name="org.hibernate.SQL" level="DEBUG" />
+    <logger name="org.hibernate.engine.QueryParameters" level="DEBUG" />
+    <logger name="org.hibernate.engine.query.HQLQueryPlan" level="DEBUG" />
+    -->
+    <!--myibatis log configure-->
+    <logger name="com.apache.ibatis" level="INFO"/>
+    <logger name="org.mybatis" level="INFO"/>
+    <logger name="java.sql.Connection" level="INFO"/>
+    <logger name="java.sql.Statement" level="INFO"/>
+    <logger name="java.sql.PreparedStatement" level="INFO"/>
+    <logger name="com.baomidou.mybatisplus" level="INFO"/>
+
+    <logger name="org.typroject" level="INFO"/>
+    <logger name="com.yeejoin.amos" level="INFO"/>
+    <logger name="org.springframework" level="INFO"/>
+
+    <!-- 日志输出级别 -->
+    <root level="INFO">
+        <appender-ref ref="FILE"/>
+    </root>
+</configuration>
\ No newline at end of file

amos-boot-system-maintenance/src/main/resources/application-jcs.properties

+#DB properties:
+spring.datasource.url = jdbc:mysql://11.11.16.4:3306/xiy_maintenance_20210729?useUnicode=true&characterEncoding=utf-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
+spring.datasource.username= root
+spring.datasource.password= Yeejoin@2020
+## eureka properties:
+eureka.client.serviceUrl.defaultZone=http://11.11.16.1:10001/eureka/
+
+security.password=a1234560
+security.loginId=jc_wjk006
+security.productWeb=STUDIO_APP_WEB
+security.productApp=STUDIO_APP_MOBILE
+security.appKey=studio_normalapp_3168830
+
+#redis 配置
+spring.redis.database=1
+spring.redis.host=11.11.16.1
+spring.redis.port=6379
+spring.redis.password=yeejoin@2020
+spring.redis.jedis.pool.max-active=200
+spring.redis.jedis.pool.max-wait=-1
+spring.redis.jedis.pool.max-idle=10
+spring.redis.jedis.pool.min-idle=0
+spring.redis.timeout=1000
+#巡检计划定时任务
+jobs.cron = 0 0/1 22-23 * * ?
+#jpush 推送配置项
+params.isPush = false
+#websocket
+params.remoteWebsocketUrl=http://11.11.16.1:8080/
+#websocket send message url
+params.remoteWebSocketSendMsgUrl=http://11.11.16.1:10601/
+
+#上传文件配置
+spring.http.multipart.maxFileSize = 80480000
+spring.http.multipart.MaxRequestSize = 80480000
+windows.img.path = D:\\
+linux.img.path = /
+
+## emqx
+emqx.clean-session=true
+emqx.client-id=${spring.application.name}-${random.int[1024,65536]}-1
+emqx.broker=tcp://11.11.16.1:2883
+emqx.user-name=admin
+emqx.password=public
+emqx.max-inflight=1000
+
+file.url=http://11.11.16.1:9000/
\ No newline at end of file

amos-boot-system-maintenance/src/main/resources/logback-jcs.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<configuration debug="false">
+    <!--定义日志文件的存储地址 勿在 LogBack 的配置中使用相对路径-->
+    <property name="LOG_HOME" value="log" />
+    <!-- 按照每天生成日志文件 -->
+    <appender name="FILE"  class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <!--日志文件输出的文件名-->
+            <FileNamePattern>${LOG_HOME}/maintenance.log.%d{yyyy-MM-dd}.%i.log</FileNamePattern>
+            <!--日志文件保留天数-->
+            <MaxHistory>30</MaxHistory>
+            <!--日志文件大小-->
+            <MaxFileSize>30mb</MaxFileSize>
+        </rollingPolicy>
+        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+            <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+        </encoder>
+    </appender>
+    <!-- 控制台输出 -->
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+            <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+        </encoder>
+    </appender>
+    <!--    show parameters for hibernate sql 专为 Hibernate 定制
+    <logger name="org.hibernate.type.descriptor.sql.BasicBinder"  level="TRACE" />
+    <logger name="org.hibernate.type.descriptor.sql.BasicExtractor"  level="DEBUG" />
+    <logger name="org.hibernate.SQL" level="DEBUG" />
+    <logger name="org.hibernate.engine.QueryParameters" level="DEBUG" />
+    <logger name="org.hibernate.engine.query.HQLQueryPlan" level="DEBUG" />
+    -->
+    <!--myibatis log configure-->
+    <logger name="com.apache.ibatis" level="DEBUG"/>
+    <logger name="org.mybatis" level="DEBUG" />
+    <logger name="java.sql.Connection" level="DEBUG"/>
+    <logger name="java.sql.Statement" level="DEBUG"/>
+    <logger name="java.sql.PreparedStatement" level="DEBUG"/>
+    <logger name="org.springframework" level="DEBUG"/>
+
+    <!-- 日志输出级别 -->
+    <root level="DEBUG">
+        <appender-ref ref="FILE" />
+        <appender-ref ref="STDOUT" />
+    </root>
+</configuration>
\ No newline at end of file

amos-boot-system-patrol/src/main/resources/application-jcs.properties

+eureka.client.serviceUrl.defaultZone=http://11.11.16.1:10001/eureka/
+eureka.client.registry-fetch-interval-seconds=5
+eureka.instance.prefer-ip-address=true
+management.endpoint.health.show-details=always
+management.endpoints.web.exposure.include=*
+eureka.instance.health-check-url-path=/actuator/health
+eureka.instance.lease-expiration-duration-in-seconds=10
+eureka.instance.lease-renewal-interval-in-seconds=5
+eureka.instance.metadata-map.management.context-path=${server.servlet.context-path}/actuator
+eureka.instance.status-page-url-path=/actuator/info
+
+ribbon.eureka.enabled = true
+ribbon.ConnectTimeout = 5000
+ribbon.ReadTimeout = 6000
+ribbon.OkToRetryOnAllOperations = true
+ribbon.MaxAutoRetriesNextServer = 2
+ribbon.MaxAutoRetries = 1
+
+#DB properties:
+spring.datasource.url = jdbc:mysql://11.11.16.4:3306/xiy_safety_business_v3.0.1_20100712?useUnicode=true&characterEncoding=utf-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
+spring.datasource.username= root
+spring.datasource.password=Yeejoin@2020
+spring.datasource.driver-class-name = com.mysql.jdbc.Driver
+spring.datasource.hikari.maxLifetime = 1765000
+spring.datasource.hikari.maximum-pool-size = 10
+spring.datasource.testWhileIdle = true
+spring.datasource.validationQuery = SELECT 1
+
+security.password=a1234560
+security.loginId=jc_wjk006
+security.productWeb=STUDIO_APP_WEB
+security.productApp=STUDIO_APP_MOBILE
+security.appKey=studio_normalapp_3168830
+
+#redis 配置
+spring.redis.database=1
+spring.redis.host=11.11.16.1
+spring.redis.port=6379
+spring.redis.password=yeejoin@2020
+spring.redis.jedis.pool.max-active=200
+spring.redis.jedis.pool.max-wait=-1
+spring.redis.jedis.pool.max-idle=10
+spring.redis.jedis.pool.min-idle=0
+spring.redis.timeout=1000
+
+#巡检计划定时任务
+jobs.cron = 0 0/1 22-23 * * ?
+
+#邮件配置
+#params.mailPush = false
+#spring.mail.host:
+#spring.mail.username:
+#spring.mail.password:
+#spring.mail.port=
+#mail.fromMail.addr =
+#spring.mail.default-encoding=UTF-8
+#spring.mail.properties.mail.smtp.auth: true
+#spring.mail.properties.mail.smtp.starttls.enable: true
+#spring.mail.properties.mail.smtp.starttls.required: true
+#spring.mail.properties.mail.smtp.ssl.enable:true
+
+#jpush 推送配置项
+params.isPush = true
+
+params.work.flow.normalProcessDefinitionKey=normalHazardManagement
+params.work.flow.processDefinitionKey=hazardManagement
+params.work.flow.address=http://11.11.16.1:30040
+params.spc.address=http://11.11.16.1:9001
+
+#websocket
+params.remoteWebsocketUrl=http://11.11.16.1:8080/
+#websocket send message url
+params.remoteWebSocketSendMsgUrl=http://11.11.16.1:10601/
+
+#上传文件配置
+spring.http.multipart.maxFileSize = 80480000
+spring.http.multipart.MaxRequestSize = 80480000
+windows.img.path = D:\\
+linux.img.path = /
+
+## emqx
+emqx.clean-session=true
+emqx.client-id=${spring.application.name}-${random.int[1024,65536]}-1
+emqx.broker=tcp://11.11.16.1:2883
+emqx.user-name=super
+emqx.password=a123456
+emqx.max-inflight=1000
+
+file.url=http://11.11.16.1:9000/

amos-boot-system-patrol/src/main/resources/logback-jcs.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<configuration debug="false">
+    <!--定义日志文件的存储地址 勿在 LogBack 的配置中使用相对路径-->
+    <property name="LOG_HOME" value="log" />
+    <!-- 按照每天生成日志文件 -->
+    <appender name="FILE"  class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <!--日志文件输出的文件名-->
+            <FileNamePattern>${LOG_HOME}/patrol.log.%d{yyyy-MM-dd}.%i.log</FileNamePattern>
+            <!--日志文件保留天数-->
+            <MaxHistory>30</MaxHistory>
+            <!--日志文件大小-->
+            <MaxFileSize>30mb</MaxFileSize>
+        </rollingPolicy>
+        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+            <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+        </encoder>
+    </appender>
+    <!-- 控制台输出 -->
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+            <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+        </encoder>
+    </appender>
+    <!--    show parameters for hibernate sql 专为 Hibernate 定制
+    <logger name="org.hibernate.type.descriptor.sql.BasicBinder"  level="TRACE" />
+    <logger name="org.hibernate.type.descriptor.sql.BasicExtractor"  level="DEBUG" />
+    <logger name="org.hibernate.SQL" level="DEBUG" />
+    <logger name="org.hibernate.engine.QueryParameters" level="DEBUG" />
+    <logger name="org.hibernate.engine.query.HQLQueryPlan" level="DEBUG" />
+    -->
+    <!--myibatis log configure-->
+    <logger name="com.apache.ibatis" level="DEBUG"/>
+    <logger name="org.mybatis" level="DEBUG" />
+    <logger name="java.sql.Connection" level="DEBUG"/>
+    <logger name="java.sql.Statement" level="DEBUG"/>
+    <logger name="java.sql.PreparedStatement" level="DEBUG"/>
+    <logger name="org.springframework" level="DEBUG"/>
+
+    <!-- 日志输出级别 -->
+    <root level="DEBUG">
+        <appender-ref ref="FILE" />
+        <appender-ref ref="STDOUT" />
+    </root>
+</configuration>
\ No newline at end of file

amos-boot-utils/amos-boot-utils-video/pom.xml

@@ -16,10 +16,10 @@
 			<artifactId>amos-boot-biz-common</artifactId>
 			<version>${amos-biz-boot.version}</version>
 		</dependency>
-		<dependency>
-			<groupId>net.sf.json-lib</groupId>
-			<artifactId>json-lib</artifactId>
-		</dependency>
+<!--		<dependency>-->
+<!--			<groupId>net.sf.json-lib</groupId>-->
+<!--			<artifactId>json-lib</artifactId>-->
+<!--		</dependency>-->
       <dependency>
           <groupId>org.springframework.boot</groupId>
           <artifactId>spring-boot-starter-data-elasticsearch</artifactId>

amos-boot-utils/amos-boot-utils-video/src/main/resources/application-jcs.properties

+## DB properties:
+spring.datasource.url=jdbc:mysql://11.11.16.4:3306/xiy_bootsystem_jcs_v1.0.0.1_20210729?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
+spring.datasource.username=root
+spring.datasource.password=Yeejoin@2020
+
+## eureka properties:
+eureka.client.serviceUrl.defaultZone=http://11.11.16.1:10001/eureka/
+
+## redis properties:
+spring.redis.database=1
+spring.redis.host=11.11.16.1
+spring.redis.port=6379
+spring.redis.password=yeejoin@2020
+## ES properties:
+biz.elasticsearch.address=11.11.16.1
+spring.data.elasticsearch.cluster-name=elasticsearch
+spring.data.elasticsearch.cluster-nodes=${biz.elasticsearch.address}:9300
+spring.elasticsearch.rest.uris=http://${biz.elasticsearch.address}:9200
+
+##biz custem properties
+biz.hk.video.url=http://11.11.16.12:9017/artemis-web/debug
+biz.hk.video.APPkey=25907430
+biz.hk.video.APPsecret=RJj3WmSNdQuyX0yCR02b
+biz.hk.video.csv=otherDomainCameraFull_1.csv

amos-boot-utils/amos-boot-utils-video/src/main/resources/logback-jcs.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<configuration debug="false">
+    <!--定义日志文件的存储地址 勿在 LogBack 的配置中使用相对路径-->
+    <property name="LOG_HOME" value="log"/>
+    <!-- 按照每天生成日志文件 -->
+    <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!--日志文件输出的文件名-->
+            <FileNamePattern>${LOG_HOME}/video.%d{yyyy-MM-dd}.%i.log</FileNamePattern>
+            <!--日志文件保留天数-->
+            <MaxHistory>30</MaxHistory>
+            <!--按大小分割同一天的-->
+            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>100MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+        </rollingPolicy>
+        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+            <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+        </encoder>
+
+    </appender>
+    <!--    show parameters for hibernate sql 专为 Hibernate 定制
+    <logger name="org.hibernate.type.descriptor.sql.BasicBinder"  level="TRACE" />
+    <logger name="org.hibernate.type.descriptor.sql.BasicExtractor"  level="DEBUG" />
+    <logger name="org.hibernate.SQL" level="DEBUG" />
+    <logger name="org.hibernate.engine.QueryParameters" level="DEBUG" />
+    <logger name="org.hibernate.engine.query.HQLQueryPlan" level="DEBUG" />
+    -->
+    <!--myibatis log configure-->
+    <logger name="com.apache.ibatis" level="INFO"/>
+    <logger name="org.mybatis" level="INFO"/>
+    <logger name="java.sql.Connection" level="INFO"/>
+    <logger name="java.sql.Statement" level="INFO"/>
+    <logger name="java.sql.PreparedStatement" level="INFO"/>
+    <logger name="com.baomidou.mybatisplus" level="INFO"/>
+
+    <logger name="org.typroject" level="INFO"/>
+    <logger name="com.yeejoin.amos" level="INFO"/>
+    <logger name="org.springframework" level="INFO"/>
+
+    <!-- 日志输出级别 -->
+    <root level="INFO">
+        <appender-ref ref="FILE"/>
+    </root>
+</configuration>
\ No newline at end of file