禅道BUG修改-云服务器配置

inventory-dao/pom.xml

@@ -47,7 +47,7 @@
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
-            <version>8.0.12</version>
+            <version>8.0.31</version>
         </dependency>
         <dependency>
             <groupId>org.freemarker</groupId>

inventory-dao/src/main/java/com/rzyc/bean/dynamic/dto/ChangeDynamicDto.java

@@ -21,11 +21,17 @@ public class ChangeDynamicDto {
     private String newtitle;
 
     /**
-     * 封面图
+     * 封面图存储地址
      */
     @ApiModelProperty(value = "封面图",required = true)
     private String coverImage;
 
+    /**
+     * 封面图访问地址
+     */
+    @ApiModelProperty(value = "封面图",required = true)
+    private String showImageUrl;
+
     @ApiModelProperty(value = "动态内容",required = true)
     private String syscnt;
 
@@ -33,6 +39,14 @@ public class ChangeDynamicDto {
     @ApiModelProperty(value = "发布时间 yyyy-MM-dd HH:mm",required = true)
     private String publicTime;
 
+    public String getShowImageUrl() {
+        return showImageUrl;
+    }
+
+    public void setShowImageUrl(String showImageUrl) {
+        this.showImageUrl = showImageUrl;
+    }
+
     public String getNewscntid() {
         return newscntid;
     }

inventory-dao/src/main/java/com/rzyc/bean/user/dto/FactorListDto.java

@@ -15,6 +15,17 @@ public class FactorListDto {
     @ApiModelProperty(value = "用户id",required = true)
     private String userId;
 
+    @ApiModelProperty(value = "履职清单ID")
+    private String listFactorId;
+
+    public String getListFactorId() {
+        return listFactorId;
+    }
+
+    public void setListFactorId(String listFactorId) {
+        this.listFactorId = listFactorId;
+    }
+
     public String getYear() {
         return year;
     }

inventory-dao/src/main/java/com/rzyc/mapper/NoticeMapper.java

@@ -34,7 +34,7 @@ public interface NoticeMapper {
     List<Notice>selectList(@Param("checkUserId") String checkUserId,
                            @Param("types") List<Integer> types);
 
-    int updateReadState(@Param("checkUserId") String checkUserId);
+    int updateReadState(@Param("checkUserId") String checkUserId,@Param("id") String id);
 
     /*批量插入*/
     Integer insertList(@Param("records") List<Notice> records);

inventory-dao/src/main/java/com/rzyc/mapper/ent/InListItemMapper.java

@@ -21,6 +21,8 @@ public interface InListItemMapper extends BaseMapper<InListItem> {
 
     List<InListItem> selectContents(@Param("industryId") String industryId, @Param("listId")String listId,@Param("postList")Integer postList);
 
+    List<InListItem> selectContentsInGov(@Param("industryId") String industryId, @Param("listId")String listId,@Param("postList")Integer postList);
+
 
     /*通过行业查询清单信息*/
     List<InListItem> findByIndustryId(@Param("industryId") String industryId);

inventory-dao/src/main/java/com/rzyc/mapper/user/ListFactorMapper.java

@@ -38,6 +38,10 @@ public interface ListFactorMapper {
     List<ListFactor> userListFactor(@Param("listPerformId") String listPerformId,
                                     @Param("time") String time);
 
+    /*用户履职档案*/
+    ListFactor userListFactorById(@Param("listPerformId") String listPerformId,
+                                    @Param("time") String time);
+
     /*修改履职档案完成情况*/
     Integer changeIsFinish(@Param("listFactorId") String listFactorId);
 

inventory-dao/src/main/java/com/rzyc/model/EntEmRehearsal.java

@@ -30,10 +30,12 @@ public class EntEmRehearsal implements Serializable {
 
     @ApiModelProperty(value = "应急演练开始时间")
     @TableField("ent_em_rehearsal_start_time")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date entEmRehearsalStartTime;
 
     @ApiModelProperty(value = "应急演练开始时间")
     @TableField("ent_em_rehearsal_end_time")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date entEmRehearsalEndTime;
 
     @ApiModelProperty(value = "应急演练项目")

inventory-dao/src/main/java/com/rzyc/model/Notice.java

@@ -67,6 +67,16 @@ public class Notice implements Serializable {
     @TableField(exist = false)
     private Long unread;
 
+    private String parameter;
+
+    public String getParameter() {
+        return parameter;
+    }
+
+    public void setParameter(String parameter) {
+        this.parameter = parameter;
+    }
+
     private static final long serialVersionUID = 1L;
 
     public Long getTotal() {

inventory-dao/src/main/java/com/rzyc/model/ent/EntUser.java

@@ -119,7 +119,7 @@ public class EntUser implements Serializable {
     private String jobNumber;
 
     @TableField(exist = false)
-    private String token;
+    private String userToken;
 
     @ApiModelProperty(value = "岗位名字")
     @TableField(exist = false)
@@ -177,14 +177,21 @@ public class EntUser implements Serializable {
         this.entPostName = entPostName;
     }
 
-    public String getToken() {
+    public String getPassword() {
-        return token;
+        return password;
     }
 
-    public void setToken(String token) {
+    public void setPassword(String password) {
-        this.token = token;
+        this.password = password;
     }
 
+    public String getUserToken() {
+        return userToken;
+    }
+
+    public void setUserToken(String userToken) {
+        this.userToken = userToken;
+    }
 
     public String getJobNumber() {
         return jobNumber;

inventory-dao/src/main/resources/mapper/NoticeMapper.xml

@@ -14,6 +14,7 @@
     <result column="type" jdbcType="INTEGER" property="type" />
     <result column="download_num" jdbcType="INTEGER" property="downloadNum" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="parameter" jdbcType="VARCHAR" property="parameter" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -286,7 +287,7 @@
   </select>
 
   <update id="updateReadState">
-    update notice set read_state = 1 where checkUserId = #{checkUserId}
+    update notice set read_state = 1 where checkUserId = #{checkUserId} and id = #{id}
   </update>
 
     <update id="oneButtonRead">

inventory-dao/src/main/resources/mapper/check/BookEntHTMapper.xml

@@ -1457,8 +1457,12 @@
     LEFT JOIN BookEntCheck bc ON bh.`BookEntCheckId` = bc.`BookEntCheckId`
     WHERE se.State = '启用'
 
-    and (se.OrgCode = #{areaCode} or se.street_code = #{areaCode} or se.community_code = #{areaCode})
+    <if test="null != areaCode and '' != areaCode">
-    and se.`EntName` LIKE #{condition}
+      and FIND_IN_SET(#{areaCode} ,se.area_path)
+    </if>
+    <if test="null != condition and '' != condition and '%%' != condition">
+      and se.`EntName` LIKE #{condition}
+    </if>
     <if test="null != htreport and '' != htreport">
       AND bh.`htreport` = #{htreport}
     </if>

inventory-dao/src/main/resources/mapper/ent/InListItemMapper.xml

@@ -59,6 +59,18 @@ item_basis, item_proof, item_law, sort_id, del_state,create_time, create_by, mod
         order by sort_id asc
     </select>
 
+    <select id="selectContentsInGov" resultMap="BaseResultMap">
+        select * from in_list_item where del_state = 1
+        <if test="null != postList and '' != postList">
+            and post_list = #{postList}
+        </if>
+        <if test="null != industryId and '' != industryId">
+            and industry_id = #{industryId}
+        </if>
+        and list_id = #{listId}
+        order by sort_id asc
+    </select>
+
     <!--通过行业查询清单信息-->
     <select id="findByIndustryId" resultMap="BaseResultMap">
         SELECT ii.* FROM `in_list_item` ii

inventory-dao/src/main/resources/mapper/ent/SysEnterpriseMapper.xml

@@ -1189,9 +1189,7 @@
     FROM SysEnterprise se
     WHERE se.`EntName` LIKE #{condition} and se.IsHide='否' AND se.State='启用'
       AND se.`EntName` != '' AND se.EntName IS NOT NULL
-      AND (se.`OrgCode` = #{areaCode}
+     AND FIND_IN_SET(#{areaCode},se.area_path)
-               OR se.`street_code` = #{areaCode}
-               OR se.`community_code` = #{areaCode})
     <if test="null != baseinclassid and '' != baseinclassid">
       AND se.work_class_id = #{baseinclassid}
     </if>

inventory-dao/src/main/resources/mapper/user/ListFactorMapper.xml

@@ -666,4 +666,15 @@
     SELECT * FROM `listfactor` lf WHERE lf.`SysYear` = #{sysYear}
   </select>
 
+  <select id="userListFactorById" resultType="com.rzyc.model.user.ListFactor">
+    SELECT lt.ModifiedOn changeTime,lf.*
+    FROM ListFactor lf
+           LEFT JOIN `ListDetail` lt ON lf.ListFactorId = lt.ListFactorId and lt.del_state = 1
+    WHERE lf.`ListPerformId` = #{listPerformId}
+      and lf.SysYear = #{time}
+      and lf.del_state = 1
+      and lf.type = #{type}
+    ORDER BY lf.`SortId` ASC ,lf.`ListNum` ASC
+  </select>
+
 </mapper>

inventory-dao/src/main/resources/mapper/user/SysUserMapper.xml

@@ -1138,9 +1138,7 @@
       WHERE su.`UserType` = '政府用户' and su.`State` = '启用' and su.SysUserId != #{userId}
         and (su.`SysUserName` like #{condition} or su.ChinaName like #{condition})
         AND su.`SysTitle` IS NOT NULL and su.`SysTitle` != ''
-        AND (su.`OrgCode` = #{areaCode}
+        AND FIND_IN_SET(#{areaCode},su.area_path)
-         OR su.`street_code` = #{areaCode}
-         OR su.`community_code` = #{areaCode})
       ORDER BY lf.`PerformClassCode` ASC,lf.`SortId` ASC
       limit 50
     </select>

inventory-ent/src/main/java/com/rzyc/service/UserLoginService.java

@@ -90,7 +90,7 @@ public class UserLoginService {
             entUser.setName(userDetails.getUsername());
             entUser.setEntUserId(id);
             entUser.setEnterpriseId(sysEnterprise.getSysenterpriseid());
-            entUser.setToken(token);
+            entUser.setUserToken(token);
             entUser.setEntPostName(entPost.getName());
             entUser.setPostId(entPost.getPostId());
             entUser.setUserTypeName("企业用户");

inventory-ent/src/main/resources/application-yun.yml

@@ -1,10 +1,9 @@
 server:
-  port: 8019
+  port: 7011
 
 spring:
   redis:
     host: 172.27.181.247
-    Auth: ENC(788KvYFV7cHJUQ31ckyvjTpUQT2sw73E)
     #    进入哨兵项目-这个端口就不用了，除非是单体
     port: 8011
 #    sentinel:
@@ -17,6 +16,7 @@ spring:
         min-idle: 0
         max-wait: 100
       shutdown-timeout: 50000
+    password: gzQdzRedis
   servlet:
     multipart:
       enabled: true
@@ -74,7 +74,7 @@ logging:
 #文件上传的配置
 onstants:
   #上传文件存放地址
-  file_location: /static/rzyc/resource/inventory/uploadFile/
+  file_location: /static/resource/inventory/uploadFile/
   #上传文件公共地址
   file_header: /static/resource/inventory/uploadFile/
   #上传文件基础路径
@@ -84,7 +84,7 @@ onstants:
   #动态详情基础地址
   html_header: http://172.27.181.247:8018/
   #logourl
-  logo_url: http://172.27.181.247/static/resource/inventory/citysafe_logo.png
+  logo_url: http://172.27.181.247:8010/static/resource/inventory/citysafe_logo.png
   #政府端帮助文档url
   help_url: http://172.27.181.247:8018/appGovHelp
   #企业端帮助文档url

inventory-ent/src/main/resources/application.yml

@@ -1,6 +1,6 @@
 spring:
   profiles:
-    active: dev #设定打包配置文件
+    active: yun #设定打包配置文件
 
 
 

inventory-gov/src/main/java/com/rzyc/controller/BaseController.java

@@ -2035,6 +2035,71 @@ public class BaseController {
         }
     }
 
+    /**
+     * 计算提醒类型 1：正常 2：黄色提醒 3：红色提醒
+     * @param listFactors
+     * @throws Exception
+     */
+    protected void handleFactorAlert(ListFactor listFactor)throws Exception{
+            System.out.println("Frequency -> "+listFactor.getFrequency());
+
+            //需要完成的总次数
+            Integer factorTotal = listFactor.getCheckstandard() * listFactor.getFrequency();
+            listFactor.setFactorTotal(factorTotal);
+
+            //已完成次数
+            Integer factorNum = 0;
+
+            if(null != listFactor.getFactorTimes() && listFactor.getFactorTimes().size() > 0){
+                factorNum = listFactor.getFactorTimes().size();
+                listFactor.setChangeTime(listFactor.getFactorTimes().get(0).getChangeTime());
+            }
+            listFactor.setFactorNum(factorNum);
+
+
+            if(!"100".equals(listFactor.getFinishProgres())){
+                listFactor.setFactorAlert(4);
+            }
+
+            /*
+             * 一年一次 半年一次 每季度一次 每月一次
+             * 一年一次 判断当前时间到12月31号的天数
+             * 半年一次 先判断是上半年还是下半年 上半年就判断到6月30的天数 下半年判断到12月30号的天数
+             * 每季度一次 判断到当前季度最后一天的天数
+             * 每月一次 判断到本月最后一天的天数
+             *
+             * 在获取提醒天数 判断提醒类型 黄色 红色
+             */
+
+            FactorDay factorDay = getDay(listFactor.getCheckstandard());
+            Integer day = factorDay.getDay();
+//            System.out.println("day -> "+day);
+
+            List<Integer> months = factorDay.getMonths();
+
+            Integer red = TypeConversion.StringToInteger(listFactor.getRedAlert());
+            Integer yellow = TypeConversion.StringToInteger(listFactor.getYellowAlert());
+
+
+            Integer changeMonth = 0;
+            if(null != listFactor.getChangeTime()){
+                changeMonth = DateUtils.parseDate2Calendar(listFactor.getChangeTime()).get(Calendar.MONTH)+1;
+            }
+
+//            System.out.println("months -> "+months);
+//            System.out.println("months -> "+changeMonth);
+//            System.out.println("months.contains(changeMonth) -> "+months.contains(changeMonth));
+            if(!(months.contains(changeMonth))){
+                //计算报警类型
+                if(day <= red){
+                    listFactor.setFactorAlert(3);
+                }else if( day >red && day <= yellow){
+                    listFactor.setFactorAlert(2);
+                }
+
+            }
+    }
+
     /**
      * 获取剩余天数
      * @param checkstandard

inventory-gov/src/main/java/com/rzyc/controller/DynamicController.java

@@ -134,7 +134,7 @@ public class DynamicController extends com.rzyc.controller.BaseController {
         newsCnt.setDelState(DelState.NOT_DEL.getState());
 
         //封面图
-        newsCnt.setCoverImage(delServiceFile(newsCnt.getCoverImage()));
+        newsCnt.setCoverImage(delServiceFile(changeDynamicDto.getShowImageUrl()));
 
         newsCnt.setPublictime(DateUtils.parseString2Date(changeDynamicDto.getPublicTime(),"yyyy-MM-dd HH:mm"));
 

inventory-gov/src/main/java/com/rzyc/controller/IndustryListController.java

@@ -337,9 +337,14 @@ public class IndustryListController extends BaseController{
     @ApiOperation(value = "读取行业公共岗位责任清单", notes = "读取行业公共岗位责任清单")
     @GetMapping("/getIndustryPostDuty")
     @ResponseBody
-    public SingleResult<InPostItem> getIndustryPostDuty(Integer page , Integer pageSize ,String industryId,@RequestParam(required = true)String postId)throws Exception{
+    public SingleResult<InPostItem> getIndustryPostDuty(Integer page , Integer pageSize ,String industryId,String postId)throws Exception{
         InPostItem inPostItem = inPostItemMapper.selectByPostId(postId);
-        return pcBusinessService.getIndustryPostDuty(page,pageSize,industryId,inPostItem.getInPostItemId());
+        //postId 是岗位id，也是公共清单id，前端将两张表的主键都放进了同一个属性里用于传参
+        if (null == inPostItem){
+            return pcBusinessService.getIndustryPostDuty(page,pageSize,industryId,postId);
+        }else {
+            return pcBusinessService.getIndustryPostDuty(page,pageSize,industryId,inPostItem.getInPostItemId());
+        }
     }
 
 
@@ -351,9 +356,15 @@ public class IndustryListController extends BaseController{
     @ApiOperation(value = "读取行业公共岗位履职清单", notes = "读取行业公共岗位履职清单")
     @GetMapping("/getIndustryPostListTask")
     @ResponseBody
-    public SingleResult<InPostList> getIndustryPostListTask(Integer page , Integer pageSize , String industryId, @RequestParam(required = true)String postId)throws Exception{
+    public SingleResult<InPostList> getIndustryPostListTask(Integer page , Integer pageSize , String industryId, String postId)throws Exception{
         InPostItem inPostItem = inPostItemMapper.selectByPostId(postId);
-        return pcBusinessService.getIndustryPostListTask(page,pageSize,industryId,inPostItem.getInPostItemId());
+        //postId 是岗位id，也是公共清单id，前端将两张表的主键都放进了同一个属性里用于传参
+        if (null == inPostItem){
+            return pcBusinessService.getIndustryPostListTask(page,pageSize,industryId,postId);
+        }else {
+            return pcBusinessService.getIndustryPostListTask(page,pageSize,industryId,inPostItem.getInPostItemId());
+        }
+
     }
 
 

inventory-gov/src/main/java/com/rzyc/controller/MinWorkController.java

@@ -1745,11 +1745,12 @@ public class MinWorkController extends BaseController{
     @PostMapping("/noticeEditState")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "checkUserId", value = "检查人Id", required = true, dataType = "string"),
+            @ApiImplicitParam(name = "id", value = "通知主键", required = true, dataType = "string"),
     })
     @ResponseBody
-    public  SingleResult noticeEditState(String checkUserId) throws Exception {
+    public  SingleResult noticeEditState(String checkUserId,String id) throws Exception {
         SingleResult singleResult = new SingleResult();
-        int result = noticeMapper.updateReadState(checkUserId);
+        int result = noticeMapper.updateReadState(checkUserId,id);
         if (result <= 0){
             singleResult.setCode(Code.ERROR.getCode());
             singleResult.setMessage(Message.ERROR);

inventory-gov/src/main/java/com/rzyc/controller/PcPersonalController.java

@@ -439,6 +439,41 @@ public class PcPersonalController extends com.rzyc.controller.BaseController {
         return result;
     }
 
+    /**
+     * 履职清单（一个）
+     * @param factorListDto
+     * @return
+     * @throws Exception
+     */
+    @LoginAuth
+    @ApiOperation(value = "履职清单（一个）", notes = "履职清单（一个）")
+    @PostMapping(value = "/factorListById")
+    @ResponseBody
+    public SingleResult<ListFactor> factorListById(@Valid FactorListDto factorListDto)throws Exception{
+        SingleResult<ListFactor> result = new SingleResult<>();
+        SysUser sysUser = sysUserMapper.selectByPrimaryKey(factorListDto.getUserId());
+        if(null != sysUser && StringUtils.isNotBlank(sysUser.getSystitle())){
+            String time = factorListDto.getYear();
+            if(StringUtils.isBlank(time)){
+                time = DateUtils.getNowDateTimeStr("yyyy");
+            }
+            ListFactor listFactor = listFactorMapper.userListFactorById(sysUser.getSystitle(),time);
+            if(null != listFactor){
+                //处理履职清单
+                handleFactorAlert(listFactor);
+                result.setData(listFactor);
+            }else{
+                result.setData(listFactor);
+            }
+        }else{
+            result.setCode(Code.NO_DATA.getCode());
+            result.setMessage(Message.NO_DATA);
+        }
+        return result;
+    }
+
+
+
     /**
      * 履职进度
      * @return
@@ -2212,8 +2247,6 @@ public class PcPersonalController extends com.rzyc.controller.BaseController {
                 for (SysUser sysUser : users){
                     if(StringUtils.isNotBlank(sysUser.getPerformClassName())){
                         String deptName = sysUser.getPerformClassName();
-
-
                         sysUser.setChinaname(deptName+"-"+sysUser.getChinaname());
                     }
                 }

inventory-gov/src/main/java/com/rzyc/controller/ent/PcCompanyController.java

@@ -678,16 +678,18 @@ public class PcCompanyController extends com.rzyc.controller.BaseController {
             sysEnterprise.setQrCode(entQrCode(sysEnterprise.getSysenterpriseid()));
             result=sysEnterpriseMapper.insert(sysEnterprise);
 
+            //生成行业对应的企业责任清单（不包括岗位的清单，只包括行业公共）
+            SaveEntListThread saveEntListThread =  new SaveEntListThread(inListItemMapper,inEntListMapper,getUserId(),sysEnterprise.getWorkClassId(),sysEnterprise.getSysenterpriseid());
+            Thread thread = new Thread(saveEntListThread);
+            thread.start();
+            thread.join();
+
 
             //创建多个行业岗位
             SaveIndustryPostThread saveIndustryPost = new SaveIndustryPostThread(sysEnterprise.getWorkClassId(),sysEnterprise.getSysenterpriseid(),inPostMapper,inPostItemMapper,inPostListMapper,inListItemMapper,sysEnterpriseMapper,entPostMapper, entPostDutyMapper,false);
             Thread saveIndustryPostThread  = new Thread(saveIndustryPost);
             saveIndustryPostThread.start();
 
-            //生成行业对应的企业责任清单（不包括岗位的清单，只包括行业公共）
-            SaveEntListThread saveEntListThread =  new SaveEntListThread(inListItemMapper,inEntListMapper,getUserId(),sysEnterprise.getWorkClassId(),sysEnterprise.getSysenterpriseid());
-            Thread thread = new Thread(saveEntListThread);
-            thread.start();
 
             //创建法人账号，用于判断手机号重复，单加不影响，没有生成履职清单和工作职责
             CopyOnWriteArrayList copyOnWriteArrayList = new CopyOnWriteArrayList();

inventory-gov/src/main/java/com/rzyc/filter/JwtAuthenticationTokenFiler.java

@@ -71,7 +71,7 @@ public class JwtAuthenticationTokenFiler extends OncePerRequestFilter {
             SecurityContextHolder.getContext().setAuthentication(authenticationToken);
 
 
-
+            System.out.println("授权通行");
             filterChain.doFilter(request, response);
         }catch (AccessDeniedException e){
             System.out.println("权限失败");

inventory-gov/src/main/java/com/rzyc/service/AssignmentTaskThread.java

@@ -110,12 +110,15 @@ public class AssignmentTaskThread implements Runnable{
 
     private SingleResult insertListAndTask(AddOrUpdateEntUserPostListDto addOrUpdateEntUserPostTaskDto,String createByUserId) throws Exception {
         EntPostList entPostList = new EntPostList();
+        Calendar calendar = Calendar.getInstance();
         SingleResult singleResult = new SingleResult();
         BeanUtils.copyProperties(addOrUpdateEntUserPostTaskDto,entPostList);
         entPostList.setCreateBy(createByUserId);
         entPostList.setCreateTime(new Date());
         entPostList.setDelState(DelState.NOT_DEL.getState());
         entPostList.setPostListId(RandomNumber.getUUid());
+        //默认清单时间当前年
+        entPostList.setYearNum(calendar.get(Calendar.YEAR));
         int  result = entPostListMapper.insert(entPostList);
         if (result != 1 ){
             singleResult.setCode(Code.ERROR.getCode());

inventory-gov/src/main/java/com/rzyc/service/PcBusinessService.java

@@ -58,7 +58,7 @@ public class PcBusinessService extends BaseController {
     @PageOperation
     public  SingleResult getIndustryPostDuty(Integer page , Integer pageSize ,String industryId,String listId){
         SingleResult singleResult = new SingleResult();
-        Page<InListItem>posts = (Page<InListItem>) inListItemMapper.selectContents(industryId,listId,null);
+        Page<InListItem>posts = (Page<InListItem>) inListItemMapper.selectContentsInGov(industryId,listId,null);
         singleResult.setDataPager(posts);
         return singleResult;
     }

inventory-gov/src/main/resources/application-yun.yml

@@ -1,5 +1,5 @@
 server:
-  port: 8018
+  port: 7010
 
 spring:
   servlet:
@@ -28,7 +28,7 @@ spring:
   #数据库
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://172.27.181.52:3306/inventory_db?useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8&useSSL=false
+    url: jdbc:mysql://172.27.181.52:3306/inventory_db?useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8&useSSL=false&autoReconnect=true
     username: ENC(QE4vB4KHgFwuqi42wTs27w==)
     password: ENC(9mRKdl9UCE8tkEsoO376nx5rCx58Htk1)
     tomcat:
@@ -59,7 +59,7 @@ logging:
 #文件上传的配置
 onstants:
   #上传文件存放地址
-  file_location: /static/rzyc/resource/inventory/uploadFile/
+  file_location: /static/resource/inventory/uploadFile/
   #上传文件公共地址
   file_header: /static/resource/inventory/uploadFile/
   #上传文件基础路径
@@ -69,7 +69,7 @@ onstants:
   #动态详情基础地址
   html_header: http://172.27.181.247:8018/
   #logourl
-  logo_url: http://172.27.181.247/static/resource/inventory/citysafe_logo.png
+  logo_url: http://172.27.181.247:8010/static/resource/inventory/citysafe_logo.png
   #政府端帮助文档url
   help_url: http://172.27.181.247:8018/appGovHelp
   #企业端帮助文档url

inventory-gov/src/main/resources/application.yml

@@ -1,6 +1,6 @@
 spring:
   profiles:
-    active: dev #设定打包配置文件
+    active: yun #设定打包配置文件