1 去掉小计注释

pom.xml

@@ -186,11 +186,11 @@
             <artifactId>nacos-client</artifactId>
             <version>1.4.2</version>
         </dependency>
-        <!--        <dependency>-->
-        <!--            <groupId>com.alibaba.cloud</groupId>-->
-        <!--            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>-->
-        <!--            <version>${nacos.version}</version>-->
-        <!--        </dependency>-->
+            <dependency>
+                <groupId>com.alibaba.cloud</groupId>
+                <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
+                <version>${nacos.version}</version>
+            </dependency>
 
         <dependency>
             <groupId>org.springframework.cloud</groupId>
@@ -340,11 +340,11 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-actuator</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
-            <version>${spring-cloud-alibaba.version}</version>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>com.alibaba.cloud</groupId>-->
+<!--            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>-->
+<!--            <version>${spring-cloud-alibaba.version}</version>-->
+<!--        </dependency>-->
     </dependencies>
 
     <build>

src/main/java/com/kcim/common/token/SaTokenConfigure.java

@@ -39,7 +39,7 @@ public class SaTokenConfigure implements WebMvcConfigurer {
                 // 主要配置登录注销接口，还有swagger相关文件 这里不需要带上server.context-path
                 .excludePathPatterns(
                         "/v2/api-docs", "/swagger-ui.html",
-                        "/static/js/**", "/swagger-resources/**");
+                        "/static/js/**", "/swagger-resources/**","/actuator/**");
 
         // 注册注解拦截器，并排除不需要注解鉴权的接口地址 (与登录拦截器无关)
 //        registry.addInterceptor(new SaAnnotationInterceptor())

src/main/java/com/kcim/service/impl/CostDepartmentProfitServiceImpl.java

@@ -350,7 +350,7 @@ public class CostDepartmentProfitServiceImpl extends BaseBatchServiceImpl<CostDe
                 i.setAmount(setSubtotal(i, costShareLevelList, listMap, list, incomeList, allocationQueryReportVOList, reportRelationMap, allocationList, allList));
             } else if (NumberConstant.FOUR.equals(calcType)) {
                 // TODO 按照计算公式进行计算
-                i.setAmount(setCalculation(i, list, costShareLevelList, listMap, incomeList, allocationQueryReportVOList, reportRelationMap, allocationList, allList));
+//                i.setAmount(setCalculation(i, list, costShareLevelList, listMap, incomeList, allocationQueryReportVOList, reportRelationMap, allocationList, allList));
             } else if (NumberConstant.FIVE.equals(calcType)) {
                 // TODO  按照责任中心进行计算
                 i.setAmount(setResponsibilityCode(i, reportRelationMap, allocationList, allList));

src/main/resources/logback-spring.xml

@@ -104,53 +104,6 @@
                 </pattern>
             </providers>
         </encoder>
-<!--        <springProfile name="dev">-->
-<!--            <destination>127.0.0.1:80821</destination>-->
-<!--            &lt;!&ndash; 日志输出编码 &ndash;&gt;-->
-<!--            <encoder charset="UTF-8" class="net.logstash.logback.encoder.LogstashEncoder">-->
-<!--                <providers>-->
-<!--                    <timestamp>-->
-<!--                        <timeZone>UTC</timeZone>-->
-<!--                    </timestamp>-->
-<!--                    <pattern>-->
-<!--                        <pattern>-->
-<!--                            {-->
-<!--                            "logLevel": "%level",-->
-<!--                            "serviceName": "${springAppName:-}",-->
-<!--                            "pid": "${PID:-}",-->
-<!--                            "thread": "%thread",-->
-<!--                            "class": "%logger{40}",-->
-<!--                            "rest": "%message"-->
-<!--                            }-->
-<!--                        </pattern>-->
-<!--                    </pattern>-->
-<!--                </providers>-->
-<!--            </encoder>-->
-<!--        </springProfile>-->
-<!--        <springProfile name="prod">-->
-<!--            <destination>127.0.0.1:80821</destination>-->
-<!--            &lt;!&ndash; 日志输出编码 &ndash;&gt;-->
-<!--            <encoder charset="UTF-8" class="net.logstash.logback.encoder.LogstashEncoder">-->
-<!--                <providers>-->
-<!--                    <timestamp>-->
-<!--                        <timeZone>UTC</timeZone>-->
-<!--                    </timestamp>-->
-<!--                    <pattern>-->
-<!--                        <pattern>-->
-<!--                            {-->
-<!--                            "logLevel": "%level",-->
-<!--                            "serviceName": "${springAppName:-}",-->
-<!--                            "pid": "${PID:-}",-->
-<!--                            "thread": "%thread",-->
-<!--                            "class": "%logger{40}",-->
-<!--                            "rest": "%message"-->
-<!--                            }-->
-<!--                        </pattern>-->
-<!--                    </pattern>-->
-<!--                </providers>-->
-<!--            </encoder>-->
-<!--        </springProfile>-->
-        <!--<encoder charset="UTF-8" class="net.logstash.logback.encoder.LogstashEncoder"/>-->
     </appender>
     <!-- 日志传输到skywalking中的appender，通过qrpc传输 -->
     <appender name="gpc-log" class="org.apache.skywalking.apm.toolkit.log.logback.v1.x.log.GRPCLogClientAppender">