修改 配置文件位置

src/main/resources/application-dev-conf.yml → config/application-dev-conf.yml

@@ -102,7 +102,7 @@ cy:
           - "/common/getKSA"
           - "/office/getFile"
           - "/office/callback"
-          - "/**/**"
+          - "/app/open/**"
         permitStatic: [ "/", "/*.html", "/favicon.ico", "/**/*.html", "/**/*.js", "/**/*.css","/swagger-ui/*" ]
         logoutSuccessUrl: "/login"
         loginPage: "/login"
@@ -181,23 +181,17 @@ global:
   code:
     admin: ROLE_1001
   resetPassword: 123456
+  oss:
+    request: "https://"
+    endpoint: "oss-cn-beijing.aliyuncs.com"
+    putAcessKey:
+    putSecretKey:
 
 logging:
+  config: ./config/logback-spring.xml
   level:
     root: info
     com.alibaba.nacos: info
+  path: D:\working\test
 
 
-oss:
-  request: "https://"
-  endpoint: "oss-cn-beijing.aliyuncs.com"
-  bucket: "catarc-res"
-  regionId: "cn-beijing"
-  put:
-    acess_key: ENC(tbI3V/L3rXALTOW7DZByISDc68laCea8fsTyvgYbobWMsQ0TGkedn01SeAT1uXlQjr8EgqrM06Po6CRH0OCFBA==)
-    secret_key: ENC(nF9aH+p4P+ZQPal7mMh3aDgNJP1hwzwDrv+GGyjZUPRkt9gLsXGCOQ9Q77kIMDY/5WttzyqNQdX+bR6TACpBmw==)
-    ram: "acs:ram::1372579886118191:role/catarc-put-role"
-  read:
-    acess_key: ENC(WubSHSvpRIFL9U3T+ZIG+Kmo7ts4VKyROdA9idt5C8bqogJpYCQNz7sREwHCZ40EhvKMihcf8VYhwVR85HVSLg==)
-    secret_key: ENC(dvdFA7j1A2D6l9+2CUpYR0c3Us76nXyu/crr6s2mo7EDmKnCadWn9UFkYC9YYl9dUycFZsm+Wn0El4Kkau5+Xg==)
-    read_time: 1800000 #读取超时时间

src/main/resources/application-kube-conf.yml → config/application-kube-conf.yml

@@ -166,8 +166,16 @@ global:
   code:
     admin: ROLE_1001
   resetPassword: 123456
+  oss:
+    request: "https://"
+    endpoint: "oss-cn-beijing.aliyuncs.com"
+    putAcessKey:
+    putSecretKey:
+
 
 logging:
+  config: /data/config/logback-spring.xml
   level:
     root: info
     com.alibaba.nacos: info
+  path: \working\test

src/main/resources/application-prod-conf.yml → config/application-prod-conf.yml

@@ -166,8 +166,16 @@ global:
    code:
      admin: ROLE_1001
    resetPassword: 123456
+   oss:
+     request: "https://"
+     endpoint: "oss-cn-beijing.aliyuncs.com"
+     putAcessKey:
+     putSecretKey:
+
 
 logging:
+  config: /data/config/logback-spring.xml
   level:
     root: info
     com.alibaba.nacos: info
+  path: \working\test

src/main/resources/application-test-conf.yml → config/application-test-conf.yml

@@ -165,7 +165,15 @@ global:
   code:
     admin: ROLE_1001
   resetPassword: 123456
+  oss:
+    request: "https://"
+    endpoint: "oss-cn-beijing.aliyuncs.com"
+    putAcessKey:
+    putSecretKey:
+
 logging:
+  config: /data/config/logback-spring.xml
   level:
     root: info
     com.alibaba.nacos: info
+  path: \working\test

src/main/resources/logback-spring.xml → config/logback-spring.xml

@@ -2,6 +2,7 @@
 
 <configuration>
 
+    <springProperty scope="context" name="LOG_PATH" source="logging.path"/>
     <appender name="consoleLog" class="ch.qos.logback.core.ConsoleAppender">
         <layout class="ch.qos.logback.classic.PatternLayout">
 
@@ -31,7 +32,7 @@
         <!--滚动策略-->
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
             <!--路径-->
-                        <fileNamePattern>/working/test/info.%d{yyyy-MM-dd}.log</fileNamePattern>
+                        <fileNamePattern>${LOG_PATH}/info.%d{yyyy-MM-dd}.log</fileNamePattern>
 <!--            <fileNamePattern>/Users/lyl/Downloads/tea_resource/info.%d{yyyy-MM-dd}.log</fileNamePattern>-->
         </rollingPolicy>
     </appender>
@@ -53,7 +54,7 @@
         <!--滚动策略-->
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
             <!--路径-->
-            <fileNamePattern>/working/test/error.%d{yyyy-MM-dd}.log</fileNamePattern>
+            <fileNamePattern>${LOG_PATH}/error.%d{yyyy-MM-dd}.log</fileNamePattern>
 <!--                        <fileNamePattern>/Users/lyl/Downloads/tea_resource/error.%d{yyyy-MM-dd}.log</fileNamePattern>-->
         </rollingPolicy>
     </appender>

src/main/java/org/rcisoft/common/component/OssGlobal.java

-package org.rcisoft.common.component;
-
-import lombok.Data;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Component;
-
-/**
- * @author Liushuaiyang
- */
-@Component
-@Data
-public class OssGlobal {
-
-    // oss-request
-    @Value("${oss.request}")
-    private String request;
-    // oss-endpoint
-    @Value("${oss.endpoint}")
-    private String endpoint;
-    // oss-bucket
-    @Value("${oss.bucket}")
-    private String bucket;
-    // oss-regionId
-    @Value("${oss.regionId}")
-    private String regionId;
-    // oss-put-acess_key
-    @Value("${oss.put.acess_key}")
-    private String putAcessKey;
-    // oss-put-secret_key
-    @Value("${oss.put.secret_key}")
-    private String putSecretKey;
-    // oss-put-ran
-    @Value("${oss.put.ram}")
-    private String putRam;
-    // oss-read-acess_key
-    @Value("${oss.read.acess_key}")
-    private String readAcessKey;
-    // oss-read-secret_key
-    @Value("${oss.read.secret_key}")
-    private String readSecretKey;
-    // oss-read-read_time
-    @Value("${oss.read.read_time}")
-    private Integer readTime;
-}

src/main/resources/mapper/business/memInfo/mapper/MemInfoMapper.xml

@@ -231,8 +231,8 @@
             <if test="entity.memYearIncome !=null ">
                 and mem_year_income = #{entity.memYearIncome}
             </if>
-            <if test="entity.mimYearIncome !=null ">
-                and mem_year_income &gt;= #{entity.mimYearIncome}
+            <if test="entity.minYearIncome !=null ">
+                and mem_year_income &gt;= #{entity.minYearIncome}
             </if>
             <if test="entity.maxYearIncome !=null ">
                 and mem_year_income &lt;= #{entity.maxYearIncome}