feats

pom.xml

@@ -162,6 +162,12 @@
 				<profiles.active>dev</profiles.active>
 			</properties>
 		</profile>
+		<profile>
+			<id>test</id>
+			<properties>
+				<profiles.active>test</profiles.active>
+			</properties>
+		</profile>
 		<profile>
 			<id>prod</id>
 			<properties>

src/main/resources/application-dev.yml

@@ -17,79 +17,9 @@ spring:
       max-file-size: 100MB
       max-request-size: 100MB
 
-##mybatis-plus
-mybatis-plus:
-  configuration:
-    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
-    call-setters-on-nulls: true
-  mapper-locations: classpath:mapper/**/*.xml
-wx:
-  miniapp:
-    appid: wxd6f47a9bb3052175
-    secret: 28f33b6bbc0f778c11a0bb234a7d6d4e
-    token:
-    aesKey:
-    msgDataFormat: JSON
-  tpls:
-  - name: notice
-    id: 6hWKexNlaVpAOvrcWxHHQ_Duz1gRIkg2-Clsktp2-Os
-    keywords: 4
-  - name: newCustomer
-    id: WiBYjqkE9KvwDv1WSq5vnuv5A6FSaOB8ETFcrVmtCEI
-    keywords: 4
-  - name: mainbiz
-    id: WiBYjqkE9KvwDv1WSq5vniGU4P0gvwlat-5ENYKpfxg
-    keywords: 6
-ali:
-  accessKeyId: LTAI5tPxzUpTbCtSVoN3eiEC
-  accessKeySecret: gRqRuNe6vftgyyBA7fYSglWIoUHntP
-  oss:
-    endpoint: oss-cn-shanghai.aliyuncs.com
-    bucketName: xlk-assets
-    bucketURL: https://xlk-assets.oss-accelerate.aliyuncs.com
-
-# 手机短信服务
-sms:
-  url: http://101.200.84.17:8081/sms
-  method: POST
-  contentType: "application/json;charset=UTF-8"
-  template:
-    code:
-    tel:
-    params:
-
-  # 以下为各模板 code
-  # 验证码
-  captcha:
-    # 模板 code
-    code: "0301"
-    # 有效时间 秒
-    expire: 120
-    # 验证码长度
-    size: 4
-    # 短信签名
-    sign: 营销云
-
-  visitor:
-    code: "0501"
-
-# 支付回调
-pay-notify: https://dev.fangdeal.cn/api/notify/
-#退款回调
-pay-refund: https://dev.fangdeal.cn/api/refund/
-
-#法大大服务器地址
-fadada:
-  appId: "403057"
-  appSecret: "xcIaK36Vc09yXXRdinXYcXhW"
-  version: "2.0"
-  authServeHost: "http://test.api.fabigbig.com:8888/api/"
-  serveHost: "https://testapi08.fadada.com/api/"
-  companyNotify: "https://dev.fangdeal.cn/api/fadd/company"
-  authReturnUrl: "https://dev.fangdeal.cn/channel/#/eContract/seal/detail?id="
-  authNotifyUrl: "https://dev.fangdeal.cn/api/fadd/autoAuthCompanySeal"
-  signNotify: "https://dev.fangdeal.cn/api/fadd/sign"
-  redirectUrl: "https://dev.fangdeal.cn/other/redirect.html"
-# file path
-file:
-  path: /images/
+## 日志
+logging:
+  path: D:\
+  config: classpath:log/logback-spring.xml
+  level:
+    root: info

src/main/resources/application-prod.yml

@@ -4,12 +4,9 @@ spring:
   application:
     name: zhiyun
   datasource:
-    username: marketing-cloud
-    password: uVV0kEQLFGqx4#mV
-    url: jdbc:mysql://rm-uf6z3z6jq11x653d77o.mysql.rds.aliyuncs.com:3306/marketing-cloud?useUnicode=true&serverTimezone=CTT&characterEncoding=utf8&allowMultiQueries=true&autoReconnect=true&zeroDateTimeBehavior=convertToNull
-#    username: marketing
-#    password: u@cSFJ5*kS9hGP7a
-#    url: jdbc:mysql://localhost:3306/marketing-cloud?useUnicode=true&serverTimezone=CTT&characterEncoding=utf8&allowMultiQueries=true&autoReconnect=true&zeroDateTimeBehavior=convertToNull
+    username: marketing
+    password: u@cSFJ5*kS9hGP7a
+    url: jdbc:mysql://localhost:3306/marketing-cloud?useUnicode=true&serverTimezone=CTT&characterEncoding=utf8&allowMultiQueries=true&autoReconnect=true&zeroDateTimeBehavior=convertToNull
     driver-class-name: com.mysql.cj.jdbc.Driver
     initial-size: 10 # 初始化连接数
     max-active: 20 # 最大连接数
@@ -20,84 +17,9 @@ spring:
       max-file-size: 10MB
       max-request-size: 50MB
 
-##mybatis-plus
-mybatis-plus:
-  configuration:
-    call-setters-on-nulls: true
-  mapper-locations: classpath:mapper/**/*.xml
-wx:
-  miniapp:
-    appid: wxd6f47a9bb3052175
-    secret: 28f33b6bbc0f778c11a0bb234a7d6d4e
-    token:
-    aesKey:
-    msgDataFormat: JSON
-  tpls:
-    - name: notice
-      id: 6hWKexNlaVpAOvrcWxHHQ_Duz1gRIkg2-Clsktp2-Os
-      keywords: 4
-    - name: newCustomer
-      id: WiBYjqkE9KvwDv1WSq5vnuv5A6FSaOB8ETFcrVmtCEI
-      keywords: 4
-    - name: mainbiz
-      id: WiBYjqkE9KvwDv1WSq5vniGU4P0gvwlat-5ENYKpfxg
-      keywords: 6
-ali:
-  accessKeyId: LTAI5tPxzUpTbCtSVoN3eiEC
-  accessKeySecret: gRqRuNe6vftgyyBA7fYSglWIoUHntP
-  oss:
-    endpoint: oss-cn-shanghai.aliyuncs.com
-    bucketName: xlk-assets
-    bucketURL: https://xlk-assets.oss-accelerate.aliyuncs.com
-
-# 手机短信服务
-sms:
-  # 先使用外网地址, 后期使用内网地址
-  url: http://101.200.84.17:8081/sms
-  method: POST
-  contentType: "application/json;charset=UTF-8"
-  template:
-    code:
-    tel:
-    params:
-
-  # 以下为各模板 code
-  # 验证码
-  captcha:
-    # 模板 code
-    code: "0301"
-    # 有效时间 秒
-    expire: 120
-    # 验证码长度
-    size: 4
-    # 短信签名
-    sign: 橙蕉
-
-  visitor:
-    code: "0501"
-
 #日志配置
 logging:
+  path: /home/xlk/marketing-cloud/service/logs
   config: classpath:log/logback-spring.xml
-  debug: true
-
-# 支付回调
-pay-notify: https://wx.fangdeal.cn/api/notify/
-#退款回调
-pay-refund: https://wx.fangdeal.cn/api/refund/
-
-#法大大服务器地址
-fadada:
-  appId: "500261"
-  appSecret: "go9yihmg7abS2lIBZpZ2yLSW"
-  version: "2.0"
-  authServeHost: "https://textapi.fadada.com/api2/"
-  serveHost: "https://textapi.fadada.com/api2/"
-  companyNotify: "https://wx.fangdeal.cn/api/fadd/company"
-  authReturnUrl: "http://admin.fangdeal.cn/#/eContract/seal/detail?id="
-  authNotifyUrl: "https://wx.fangdeal.cn/api/fadd/autoAuthCompanySeal"
-  signNotify: "https://wx.fangdeal.cn/api/fadd/sign"
-  redirectUrl: "https://wx.fangdeal.cn/other/redirect.html"
-# file path
-file:
-  path: /images/
+  level:
+    root: info

src/main/resources/application-test.yml

@@ -0,0 +1,25 @@
+server:
+  port: 8567
+spring:
+  application:
+    name: marketing-cloud
+  datasource:
+    username: marketing-cloud
+    password: uVV0kEQLFGqx4#mV
+    url: jdbc:mysql://rm-uf6z3z6jq11x653d77o.mysql.rds.aliyuncs.com:3306/marketing-cloud?useUnicode=true&serverTimezone=CTT&characterEncoding=utf8&allowMultiQueries=true&autoReconnect=true&zeroDateTimeBehavior=convertToNull
+    driver-class-name: com.mysql.cj.jdbc.Driver
+    initial-size: 10 # 初始化连接数
+    max-active: 20 # 最大连接数
+    min-idle: 8 # 最小空闲数
+    max-idle: 8 # 最大空闲数
+  servlet:
+    multipart:
+      max-file-size: 100MB
+      max-request-size: 100MB
+
+## 日志
+logging:
+  path: /yunpan/dev/logs
+  config: classpath:log/logback-spring.xml
+  level:
+    root: info

src/main/resources/application.yml

@@ -1,3 +1,82 @@
+
+##mybatis-plus
+mybatis-plus:
+  configuration:
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+    call-setters-on-nulls: true
+  mapper-locations: classpath:mapper/**/*.xml
+wx:
+  miniapp:
+    appid:
+    secret:
+    token:
+    aesKey:
+    msgDataFormat: JSON
+  tpls:
+    - name: notice
+      id: 6hWKexNlaVpAOvrcWxHHQ_Duz1gRIkg2-Clsktp2-Os
+      keywords: 4
+    - name: newCustomer
+      id: WiBYjqkE9KvwDv1WSq5vnuv5A6FSaOB8ETFcrVmtCEI
+      keywords: 4
+    - name: mainbiz
+      id: WiBYjqkE9KvwDv1WSq5vniGU4P0gvwlat-5ENYKpfxg
+      keywords: 6
+ali:
+  accessKeyId: LTAI5tPxzUpTbCtSVoN3eiEC
+  accessKeySecret: gRqRuNe6vftgyyBA7fYSglWIoUHntP
+  oss:
+    endpoint: oss-cn-shanghai.aliyuncs.com
+    bucketName: xlk-assets
+    bucketURL: https://xlk-assets.oss-accelerate.aliyuncs.com
+
+# file path
+file:
+  path: /images/
+
+# 手机短信服务
+sms:
+  url:
+  method: POST
+  contentType: "application/json;charset=UTF-8"
+  template:
+    code:
+    tel:
+    params:
+
+  # 以下为各模板 code
+  # 验证码
+  captcha:
+    # 模板 code
+    code: "0301"
+    # 有效时间 秒
+    expire: 120
+    # 验证码长度
+    size: 4
+    # 短信签名
+    sign: 营销云
+
+  visitor:
+    code: "0501"
+
+# 支付回调
+pay-notify:
+#退款回调
+pay-refund:
+
+#法大大服务器地址
+fadada:
+  appId: ""
+  appSecret: ""
+  version: ""
+  authServeHost: ""
+  serveHost: ""
+  companyNotify: ""
+  authReturnUrl: ""
+  authNotifyUrl: ""
+  signNotify: ""
+  redirectUrl: ""
+
 ### spring
 spring:
   profiles:

src/main/resources/log/logback-spring.xml

@@ -1,114 +1,85 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration debug="false">
-    <springProfile name="prod">
-        <!--定义日志文件的存储地址 勿在 LogBack 的配置中使用相对路径-->
+    <!--引入默认的一些设置-->
+    <include resource="org/springframework/boot/logging/logback/defaults.xml"/>
+    <!--定义日志文件的存储地址 从springboot配置文件中获取路径-->
+    <springProperty scope="context" name="LOG_HOME" source="logging.path"/>
+    <!--springboot配置文件中获取日志级别-->
+    <springProperty scope="context" name="LOG_LEVEL" source="logging.level.root"/>
+    <!--定义日志文件的存储地址 勿在 LogBack 的配置中使用相对路径-->
 <!--        <property name="LOG_HOME" value="/home/xlk/marketing-cloud/service/logs" />-->
-        <property name="LOG_HOME" value="/yunpan/dev/logs" />
-        <!-- 控制台输出 -->
-        <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-                <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
-                <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
-            </encoder>
-        </appender>
-        <!-- 按照每天生成日志文件 -->
-        <appender name="FILE"  class="ch.qos.logback.core.rolling.RollingFileAppender">
-            <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-                <!--日志文件输出的文件名-->
-                <FileNamePattern>${LOG_HOME}/marketing-%d{yyyy-MM-dd}.log</FileNamePattern>
-                <!--日志文件保留天数-->
-                <MaxHistory>30</MaxHistory>
-            </rollingPolicy>
-            <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-                <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
-                <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
-            </encoder>
-            <!--日志文件最大的大小-->
-            <!--        <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">-->
-            <!--            <MaxFileSize>10MB</MaxFileSize>-->
-            <!--        </triggeringPolicy>-->
-        </appender>
+<!--    <property name="LOG_HOME" value="/yunpan/dev/logs" />-->
+    <!-- 控制台输出 -->
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+            <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+        </encoder>
+    </appender>
+    <!-- 按照每天生成日志文件 -->
+    <appender name="FILE"  class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!--日志文件输出的文件名-->
+            <FileNamePattern>${LOG_HOME}/marketing-%d{yyyy-MM-dd}.log</FileNamePattern>
+            <!--日志文件保留天数-->
+            <MaxHistory>30</MaxHistory>
+        </rollingPolicy>
+        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+            <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+        </encoder>
+        <!--日志文件最大的大小-->
+        <!--        <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">-->
+        <!--            <MaxFileSize>10MB</MaxFileSize>-->
+        <!--        </triggeringPolicy>-->
+    </appender>
+
+    <!-- 按照每天生成日志文件 -->
+    <appender name="MYSQL"  class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!--日志文件输出的文件名-->
+            <FileNamePattern>${LOG_HOME}/marketing-%d{yyyy-MM-dd}-sql.log</FileNamePattern>
+            <!--日志文件保留天数-->
+            <MaxHistory>30</MaxHistory>
+        </rollingPolicy>
+        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+            <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+        </encoder>
+        <!--日志文件最大的大小-->
+        <!--                <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">-->
+        <!--                    <MaxFileSize>1024MB</MaxFileSize>-->
+        <!--                </triggeringPolicy>-->
+    </appender>
 
-        <!-- 按照每天生成日志文件 -->
-        <appender name="MYSQL"  class="ch.qos.logback.core.rolling.RollingFileAppender">
-            <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-                <!--日志文件输出的文件名-->
-                <FileNamePattern>${LOG_HOME}/marketing-%d{yyyy-MM-dd}-sql.log</FileNamePattern>
-                <!--日志文件保留天数-->
-                <MaxHistory>30</MaxHistory>
-            </rollingPolicy>
-            <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-                <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
-                <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
-            </encoder>
-            <!--日志文件最大的大小-->
-            <!--                <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">-->
-            <!--                    <MaxFileSize>1024MB</MaxFileSize>-->
-            <!--                </triggeringPolicy>-->
-        </appender>
+    <!--myibatis log configure-->
+    <logger name="com.yunzhi.marketing.mapper" level="DEBUG" additivity="false">
+        <appender-ref ref="MYSQL" />
+    </logger>
 
-        <!--myibatis log configure-->
-        <logger name="com.yunzhi.marketing.mapper" level="DEBUG" additivity="false">
+    <!--生产环境:打印控制台和输出到文件-->
+    <springProfile name="prod">
+        <root level="${LOG_LEVEL}">
+            <appender-ref ref="STDOUT"/>
+            <appender-ref ref="FILE"/>
             <appender-ref ref="MYSQL" />
-        </logger>
+        </root>
     </springProfile>
 
+    <!--开发环境:打印控制台-->
     <springProfile name="dev">
-        <!--定义日志文件的存储地址 勿在 LogBack 的配置中使用相对路径-->
-        <property name="LOG_HOME" value="/yunpan/dev/logs" />
-        <!-- 控制台输出 -->
-        <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-            <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-                <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
-                <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
-            </encoder>
-        </appender>
-        <!-- 按照每天生成日志文件 -->
-        <appender name="FILE"  class="ch.qos.logback.core.rolling.RollingFileAppender">
-            <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-                <!--日志文件输出的文件名-->
-                <FileNamePattern>${LOG_HOME}/marketing-%d{yyyy-MM-dd}.log</FileNamePattern>
-                <!--日志文件保留天数-->
-                <MaxHistory>30</MaxHistory>
-            </rollingPolicy>
-            <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-                <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
-                <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
-            </encoder>
-            <!--日志文件最大的大小-->
-            <!--        <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">-->
-            <!--            <MaxFileSize>10MB</MaxFileSize>-->
-            <!--        </triggeringPolicy>-->
-        </appender>
-
-        <!-- 按照每天生成日志文件 -->
-        <appender name="MYSQL"  class="ch.qos.logback.core.rolling.RollingFileAppender">
-            <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-                <!--日志文件输出的文件名-->
-                <FileNamePattern>${LOG_HOME}/marketing-%d{yyyy-MM-dd}-sql.log</FileNamePattern>
-                <!--日志文件保留天数-->
-                <MaxHistory>30</MaxHistory>
-            </rollingPolicy>
-            <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-                <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
-                <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
-            </encoder>
-            <!--日志文件最大的大小-->
-            <!--                <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">-->
-            <!--                    <MaxFileSize>1024MB</MaxFileSize>-->
-            <!--                </triggeringPolicy>-->
-        </appender>
+        <root level="${LOG_LEVEL}">
+            <appender-ref ref="STDOUT"/>
+        </root>
+    </springProfile>
 
-        <!--myibatis log configure-->
-        <logger name="com.yunzhi.marketing.mapper" level="DEBUG" additivity="false">
+    <!--测试环境:打印控制台-->
+    <springProfile name="test">
+        <root level="${LOG_LEVEL}">
+            <appender-ref ref="STDOUT"/>
+            <appender-ref ref="FILE"/>
             <appender-ref ref="MYSQL" />
-        </logger>
+        </root>
     </springProfile>
 
-    <!-- 日志输出级别 -->
-    <root level="INFO">
-        <appender-ref ref="STDOUT" />
-        <appender-ref ref="FILE" />
-        <appender-ref ref="MYSQL" />
-    </root>
 </configuration>