替换ip

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/LeaveSheetServiceImpl.java

@@ -97,18 +97,18 @@ public class LeaveSheetServiceImpl extends ServiceImpl<LeaveSheetMapper, LeaveSh
             //按天请假时，计算小时数
             float v = timeType.getAllday() * sheet.getTimeDays();
             sheet.setTimeHours(v);
-        }
-        if (isNew) {
-            //检查该时间段是否已经有按天请假
-            QueryWrapper<LeaveSheet> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("owner_id", sheet.getOwnerId());
-            queryWrapper.le("start_date", sheet.getEndDate()).ge("end_date", sheet.getStartDate());
-
-            int count = leaveSheetMapper.selectCount(queryWrapper);
-            if (count > 0) {
-                //msg.setError("该时间段已有请假申请，不能重复请假");
-                msg.setError(MessageUtils.message("leave.repeatedLeave"));
-                return msg;
+            if (isNew) {
+                //当前是按天请假，需要检查是否已有按天的；按小时请假则不需要校验
+                QueryWrapper<LeaveSheet> queryWrapper = new QueryWrapper<>();
+                queryWrapper.eq("owner_id", sheet.getOwnerId());
+                queryWrapper.eq("time_type", 0);
+                queryWrapper.le("start_date", sheet.getEndDate()).ge("end_date", sheet.getStartDate());
+                int count = leaveSheetMapper.selectCount(queryWrapper);
+                if (count > 0) {
+                    //msg.setError("该时间段已有请假申请，不能重复请假");
+                    msg.setError(MessageUtils.message("leave.repeatedLeave"));
+                    return msg;
+                }
             }
         }
 

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/WxCorpInfoServiceImpl.java

@@ -257,8 +257,8 @@ public class WxCorpInfoServiceImpl extends ServiceImpl<WxCorpInfoMapper, WxCorpI
         params.put("type","file");
         params.put("filename",fileName);
 //        params.put("url","https://worktime.ttkuaiban.com/upload/"+fileName);
-        params.put("url","http://47.101.180.183:9097/upload/"+fileName);
-//        System.out.println("uploadJobFileUrl=== "+"http://47.101.180.183:9097/upload/"+fileName);
+        params.put("url","http://1.94.62.58:9097/upload/"+fileName);
+//        System.out.println("uploadJobFileUrl=== "+"http://1.94.62.58:9097/upload/"+fileName);
         params.put("md5",md5);
         String requestBody = JSONObject.toJSONString(params);
         HttpEntity<String> entity = new HttpEntity<>(requestBody, headers);

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/task/TimingTask.java

@@ -1450,7 +1450,7 @@ public class TimingTask {
         }
         SysConfig config = sysConfigMapper.selectOne(new QueryWrapper<SysConfig>().eq("param_key", "wx_suite_ticket"));
         if (config != null) {
-            String url = "http://47.101.180.183:10010/wxcorp/updateSuiteTicket?suiteTicket="
+            String url = "http://1.94.62.58:10010/wxcorp/updateSuiteTicket?suiteTicket="
                     +config.getParamValue();
             String forObject = this.restTemplate.getForObject(url, String.class);
             JSONObject json = JSONObject.parseObject(forObject);

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/util/CodeGenerator.java

@@ -92,7 +92,7 @@ public class CodeGenerator {
 
         // 数据源配置
         DataSourceConfig dsc = new DataSourceConfig();
-        dsc.setUrl("jdbc:mysql://47.101.180.183:17089/man_dev?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8");
+        dsc.setUrl("jdbc:mysql://1.94.62.58:17089/man_dev?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8");
 //        dsc.setSchemaName("public");
         dsc.setDriverName("com.mysql.cj.jdbc.Driver");
         dsc.setUsername("root");

fhKeeper/formulahousekeeper/management-platform/src/main/resources/application-bkserver.yml

@@ -13,7 +13,7 @@ spring:
       max-request-size: 100MB
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://47.101.180.183:3306/man_dev?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8&rewriteBatchedStatements=true&&useSSL=false
+    url: jdbc:mysql://1.94.62.58:3306/man_dev?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8&rewriteBatchedStatements=true&&useSSL=false
     username: root
     password: HuoshiDB@2022
     hikari:

fhKeeper/formulahousekeeper/management-platform/src/main/resources/application-privatewx.yml

@@ -86,7 +86,7 @@ referer:
     - localhost
     - privatewx.ttkuaiban.com
     - mobprivatewx.ttkuaiban.com
-    - 47.101.180.183
+    - 1.94.62.58
 #企业微信相关参数
 suitId: ww4e237fd6abb635af
 suitSecret: 1ApL6LIB4Z0v7wBrKTUNmJrerRWV3gEQWBlYOm8Kijw

fhKeeper/formulahousekeeper/management-platform/src/main/resources/application.yml

@@ -15,7 +15,7 @@ spring:
       location: C:/upload/
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://47.101.180.183:17089/man_hour_manager?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8&rewriteBatchedStatements=true&useSSL=false
+    url: jdbc:mysql://1.94.62.58:17089/man_hour_manager?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8&rewriteBatchedStatements=true&useSSL=false
     username: root
     password: P011430@Huoshi*
 #    url: jdbc:mysql://47.100.37.243:7644/man_hour_manager?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8&rewriteBatchedStatements=true
@@ -151,7 +151,7 @@ referer:
     - app71020.eapps.dingtalkcloud.com
     - mldmobworktime.ttkuaiban.com
     - mldworktime.ttkuaiban.com
-    - 47.101.180.183
+    - 1.94.62.58
 excludeUrls: /wxcorp/*,/wxcorp/*/*,/dingding/*,/feishu-info/*,/error,/testClient,/corpWXAuth,/corpWXScanningAuth,/corpInsideWXAuth,/wx-corp-info/*,/clean/*,/innerRoles/*,/project/getProjectListByToken,/project/getTimeCostByToken,/report/getReportListByToken,/report/getProcessErrorData,/project/synchronizationProject,/user/updateUserDeptHierarchy,/report/getUserTimeCostByThird,/report/getProjectTimeCostByThird,/leave-sheet-fv/*,/report/getNotFullReportUserList
 
 #企业微信相关参数