Merge remote-tracking branch 'origin/dev'

epmet-gateway/pom.xml

@@ -233,6 +233,9 @@
                 <!--宣传服务-->
                 <gateway.routes.epmet-openapi-adv-server.url>lb://epmet-openapi-adv-server</gateway.routes.epmet-openapi-adv-server.url>
                 <!--<gateway.routes.epmet-ext-server.url>lb://127.0.0.1:8115</gateway.routes.epmet-ext-server.url>-->
+                <!--钉钉 机器人地址-->
+                <dingTalk.robot.webHook>https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4</dingTalk.robot.webHook>
+                <dingTalk.robot.secret>SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd</dingTalk.robot.secret>
             </properties>
         </profile>
         <profile>
@@ -361,6 +364,9 @@
                 <!--宣传服务-->
                 <gateway.routes.epmet-openapi-adv-server.url>lb://epmet-openapi-adv-server</gateway.routes.epmet-openapi-adv-server.url>
                 <!--<gateway.routes.epmet-openapi-adv-server.url>http://localhost:8115</gateway.routes.epmet-openapi-adv-server.url>-->
+                <!--钉钉 机器人地址-->
+                <dingTalk.robot.webHook>https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4</dingTalk.robot.webHook>
+                <dingTalk.robot.secret>SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd</dingTalk.robot.secret>
             </properties>
         </profile>
         <profile>
@@ -458,6 +464,9 @@
 
                 <!--宣传服务-->
                 <gateway.routes.epmet-openapi-adv-server.url>lb://epmet-openapi-adv-server</gateway.routes.epmet-openapi-adv-server.url>
+                <!--钉钉 机器人地址-->
+                <dingTalk.robot.webHook>https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4</dingTalk.robot.webHook>
+                <dingTalk.robot.secret>SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd</dingTalk.robot.secret>
             </properties>
         </profile>
         <profile>
@@ -552,6 +561,9 @@
 
                 <!--宣传服务-->
                 <gateway.routes.epmet-openapi-adv-server.url>lb://epmet-openapi-adv-server</gateway.routes.epmet-openapi-adv-server.url>
+                <!--生产钉钉 机器人地址-->
+                <dingTalk.robot.webHook>https://oapi.dingtalk.com/robot/send?access_token=a5f66c3374b1642fe2142dbf56d5997e280172d4e8f2b546c9423a68c82ece6c</dingTalk.robot.webHook>
+                <dingTalk.robot.secret>SEC95f4f40b533ad379ea6a6d1af6dd37029383cfe1b7cd96dfac2678be2c1c3ed1</dingTalk.robot.secret>
             </properties>
         </profile>
     </profiles>

epmet-gateway/src/main/java/com/epmet/auth/ExternalAuthProcessor.java

@@ -16,7 +16,6 @@ import org.springframework.http.HttpHeaders;
 import org.springframework.http.server.reactive.ServerHttpRequest;
 import org.springframework.stereotype.Component;
 import org.springframework.util.AntPathMatcher;
-import org.springframework.util.MultiValueMap;
 import org.springframework.web.server.ServerWebExchange;
 
 /**
@@ -73,6 +72,7 @@ public class ExternalAuthProcessor extends AuthProcessor {
         }
 
         if (!inPaths) {
+            logger.error("auth 401 ,uri:{}",requestUri);
             throw new RenException(EpmetErrorCode.ERR401.getCode(), "所请求的url并未对外部应用开放");
         }
 

epmet-gateway/src/main/resources/bootstrap.yml

@@ -476,14 +476,24 @@ epmet:
   # 外部应用认证，使用AccessToken等头进行认证
   externalOpenUrls:
     - /data/report/**
-    - /data/stats/**
     - /epmet/ext/**
     - /epmetuser/customerstaff/customerlist
     - /message/template/**
     - /data/aggregator/project/projectdistribution
     - /data/aggregator/epmetuser/open-staffdetail
+    #stats external包下 公共的类只外部暴露方法 纯外部使用的 暴漏整个
     - /data/stats/statsuser/gm-uploadevent
     - /data/stats/statsuser/gm-uploaddata
+    - /data/stats/indexcalculate/all
+    - /data/stats/kcscreencoll/**
+    - /data/stats/indexcollect/**
+    - /data/stats/anscreencoll/**
+    - /data/stats/plugin/**
+    - /data/stats/screencoll/**
+    - /data/stats/project/**
+    - /data/stats/basereport/**
+    - /data/stats/governance/**
+
 
   # 对外开放接口认证白名单
   externalAuthUrlsWhiteList:
@@ -497,3 +507,8 @@ jwt:
     secret: 7016867071f0ebf1c46f123eaaf4b9d6[elink.epmet]
     #token有效时长，默认7天，单位秒
     expire: 604800
+
+dingTalk:
+  robot:
+    webHook: @dingTalk.robot.webHook@
+    secret: @dingTalk.robot.secret@

epmet-gateway/src/main/resources/logback-spring.xml

@@ -5,6 +5,8 @@
     <property name="log.path" value="logs/gateway"/>
 
     <springProperty scope="context" name="appname" source="spring.application.name"/>
+    <springProperty scope="context" name="webHook" source="dingTalk.robot.webHook"/>
+    <springProperty scope="context" name="secret" source="dingTalk.robot.secret"/>
 
     <!-- 日志上下文名称 -->
     <contextName>${appname}</contextName>
@@ -131,13 +133,21 @@
             <onMatch>ACCEPT</onMatch>
             <onMismatch>DENY</onMismatch>
         </filter>
+        <!-- 此日志文档只记录ERROR级别的 发送钉钉短信 -->
+        <filter class="com.epmet.commons.tools.filter.LogMsgSendFilter">
+            <level>ERROR</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+            <webHook>${webHook}</webHook>
+            <secret>${secret}</secret>
+            <appName>${appname}</appName>
+        </filter>
     </appender>
 
     <!-- 开发、测试环境 -->
-    <springProfile name="dev,test">
+    <springProfile name="local,dev,test">
         <logger name="org.springframework.web" level="INFO"/>
         <logger name="org.springboot.sample" level="INFO"/>
-        <logger name="com.epmet" level="INFO"/>
         <logger name="com.epmet" level="DEBUG"/>
         <root level="INFO">
             <appender-ref ref="DEBUG_FILE"/>

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/AnScreenCollController.java → epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/external/AnScreenCollController.java

@@ -1,4 +1,4 @@
-package com.epmet.controller;
+package com.epmet.controller.external;
 
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/BaseReportController.java → epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/external/BaseReportController.java

@@ -1,4 +1,4 @@
-package com.epmet.controller;
+package com.epmet.controller.external;
 
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/FactIndexCollectController.java → epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/external/FactIndexCollectController.java

@@ -1,4 +1,4 @@
-package com.epmet.controller;
+package com.epmet.controller.external;
 
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.indexcollect.form.*;

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/GovernanceDataReportController.java → epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/external/GovernanceDataReportController.java

@@ -1,4 +1,4 @@
-package com.epmet.controller;
+package com.epmet.controller.external;
 
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.extract.form.AgencyGovernDailyFormDTO;
@@ -8,7 +8,6 @@ import com.epmet.service.GovernanceDataReportService;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import java.sql.ResultSet;
 
 /**
  * 治理能力数据上报

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/IndexCalculateController.java → epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/external/IndexCalculateController.java

@@ -1,4 +1,4 @@
-package com.epmet.controller;
+package com.epmet.controller.external;
 
 import com.epmet.commons.tools.enums.EnvEnum;
 import com.epmet.commons.tools.exception.RenException;

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/KcScreenCollController.java → epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/external/KcScreenCollController.java

@@ -1,4 +1,4 @@
-package com.epmet.controller;
+package com.epmet.controller.external;
 
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/ScreenProjectDataCollController.java → epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/external/ScreenProjectDataCollController.java

@@ -1,4 +1,4 @@
-package com.epmet.controller;
+package com.epmet.controller.external;
 
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/ShiBeiScreenCollController.java → epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/external/ShiBeiScreenCollController.java

@@ -1,4 +1,4 @@
-package com.epmet.controller;
+package com.epmet.controller.external;
 
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.indexcollect.form.CustomerBizOrgFormDTO;

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/StatsUserController.java → epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/external/StatsUserController.java

@@ -1,4 +1,4 @@
-package com.epmet.controller;
+package com.epmet.controller.external;
 
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
@@ -30,6 +30,7 @@ public class StatsUserController {
      * @param formDTO
      * @description 工作端数据一期，用户分析：参与用户、注册用户分析
      * @Date 2021/3/26 13:27
+     * 自用的方法 不暴漏
      **/
     @RequestMapping("execute")
     public Result execute(@RequestBody StatsFormDTO formDTO) {

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/plugins/OfsController.java → epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/external/plugins/OfsController.java

@@ -1,4 +1,4 @@
-package com.epmet.controller.plugins;
+package com.epmet.controller.external.plugins;
 
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/plugins/WorkRecordColController.java → epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/external/plugins/WorkRecordColController.java

@@ -1,4 +1,4 @@
-package com.epmet.controller.plugins;
+package com.epmet.controller.external.plugins;
 
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;

epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/PublishSuggestionFormDTO.java

@@ -30,6 +30,6 @@ public class PublishSuggestionFormDTO implements Serializable {
     @NotNull(message = "是否匿名不能为空", groups = {AddUserInternalGroup.class})
     private Boolean publicFlag;
 
-    @Length(max = 500, message = "内容不能超过500字", groups = {AddUserShowGroup.class})
+    @Length(min = 1, max = 500, message = "内容不能为空,且不能超过500字", groups = {AddUserShowGroup.class})
     private String suggestion;
 }