commit

admin/src/main/resources/application.yml

@@ -47,7 +47,7 @@ spring:
 #  configuration:
 #    map-underscore-to-camel-case: true #下划线转驼峰
 server:
-  port: 9000
+  port: 8080
   servlet:
     context-path: /admin
 # PageHelper
@@ -65,7 +65,7 @@ sa-token:
   # token 名称（同时也是 cookie 名称）
   token-name: satoken
   # token 有效期（单位：秒） 默认30分钟，-1 代表永久有效
-  timeout: 1800
+  timeout: -1
   # token 最低活跃频率（单位：秒），如果 token 超过此时间没有访问系统就会被冻结，默认-1 代表不限制，永不冻结
   active-timeout: -1
   # 是否允许同一账号多地同时登录 （为 true 时允许一起登录, 为 false 时新登录挤掉旧登录）
@@ -77,6 +77,30 @@ sa-token:
   # 是否输出操作日志
   is-log: true
 
+# 微信支付
+wechat:
+  payment:
+    appid: wx369fcff95d387bde
+    # 微信商户号
+    mchid: 1635831469
+    mchsn: 6A45EEB068369430B2FFD45EA29F641A8E18165F
+    v3Key: iTRovdvaTUQq0b9Jr91D7Tx66JnIes5U
+    notifyUrl: https://www.kuaiyuman.cn/api/payment/notify
+    #    certPath: /data/wwwroot/charge/config/cert/apiclient_cert.pem
+    #    keyPath: /data/wwwroot/charge/config/cert/apiclient_key.pem
+    certPath: cert/apiclient_cert.pem
+    keyPath: cert/apiclient_key.pem
+
+  miniapp:
+    appid: wx369fcff95d387bde
+    secret: e36560b99afd5f744754cd09e8f6cc2a
+    # 以下需要先开通消息推送
+    token: #微信小程序消息服务器配置的token
+    aesKey: #微信小程序消息服务器配置的EncodingAESKey
+    msgDataFormat: JSON
+
+
+
 # EN+充电配置
 en-plus:
   # 运营商ID
@@ -90,4 +114,17 @@ en-plus:
   # 签名密钥
   sig-secret: 2365b20f69e44817
   # 最小充电余额（分）
-  charge-min-amount: 200
+  charge-min-amount: 200
+
+#文件上传配置
+upload:
+  file:
+    storage: file_storage  #文件存放地址
+    size: 20  #最大上传Mb
+
+oss:
+  endpoint: oss-cn-shenzhen.aliyuncs.com
+  keyId:
+  keySecret:
+  bucket: kym-static
+  prefix: static.kuaiyuman.cn

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

@@ -1,201 +1,36 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE configuration>
-<configuration>
-    <!--引用默认日志配置-->
-    <include resource="org/springframework/boot/logging/logback/defaults.xml"/>
-    <!--使用默认的控制台日志输出实现-->
-<!--    <include resource="org/springframework/boot/logging/logback/console-appender.xml"/>-->
-    <!--应用名称-->
-    <springProperty scope="context" name="APP_NAME" source="spring.application.name" defaultValue="springBoot"/>
-    <!--日志文件保存路径-->
-    <property name="LOG_FILE_PATH" value="/data/logs/admin"/>
-<!--    <property name="LOG_FILE_PATH" value="opt/logs/admin"/>   -->
-    <!--LogStash访问host-->
-    <!--    <springProperty name="LOG_STASH_HOST" scope="context" source="logstash.host" defaultValue="localhost"/>-->
-    <!--是否开启LogStash插件内部日志-->
-    <!--    <springProperty name="ENABLE_INNER_LOG" scope="context" source="logstash.enableInnerLog" defaultValue="false"/>-->
-
-    <!--DEBUG日志输出到文件-->
-    <appender name="FILE_DEBUG" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <!--输出DEBUG以上级别日志-->
-        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-            <level>DEBUG</level>
-        </filter>
+<configuration scan="true" scanPeriod="60 seconds" debug="false">
+    <contextName>logback</contextName>
+    <property name="log.path" value="logs/admin/admin.log"/>
+    <property name="CONSOLE_LOG_PATTERN"
+              value="%date{yyyy-MM-dd HH:mm:ss} | %highlight(%-5level) | %boldYellow(%thread) | %boldGreen(%logger) | %msg%n"/>
+    <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>
-            <!--设置为默认的文件日志格式-->
-            <pattern>${FILE_LOG_PATTERN}</pattern>
-            <charset>UTF-8</charset>
+            <pattern>%d{HH:mm:ss.SSS}|%thread|%-5level|%logger{36}|%X{ip}|%X{seq}|%msg%n</pattern>
         </encoder>
-        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <!--设置文件命名格式-->
-            <fileNamePattern>${LOG_FILE_PATH}/debug/${APP_NAME}-%d{yyyy-MM-dd}-%i.log</fileNamePattern>
-            <!--设置日志文件大小，超过就重新生成文件，默认10M-->
-            <maxFileSize>${LOG_FILE_MAX_SIZE:-10MB}</maxFileSize>
-            <!--日志文件保留天数，默认30天-->
-            <maxHistory>${LOG_FILE_MAX_HISTORY:-30}</maxHistory>
-        </rollingPolicy>
     </appender>
-
-    <!--ERROR日志输出到文件-->
-    <appender name="FILE_ERROR" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <!--只输出ERROR级别的日志-->
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <level>ERROR</level>
-            <onMatch>ACCEPT</onMatch>
-            <onMismatch>DENY</onMismatch>
-        </filter>
+    <appender name="file" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${log.path}</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>./logs/admin/admin-%d{yyyy-MM-dd}.log.gz</fileNamePattern>
+        </rollingPolicy>
         <encoder>
-            <!--设置为默认的文件日志格式-->
-            <pattern>${FILE_LOG_PATTERN}</pattern>
-            <charset>UTF-8</charset>
+            <pattern>%d{HH:mm:ss.SSS}|%thread|%-5level|%logger{36}|%X{ip}|%X{seq}|%msg%n</pattern>
         </encoder>
-        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <!--设置文件命名格式-->
-            <fileNamePattern>${LOG_FILE_PATH}/error/${APP_NAME}-%d{yyyy-MM-dd}-%i.log</fileNamePattern>
-            <!--设置日志文件大小，超过就重新生成文件，默认10M-->
-            <maxFileSize>${LOG_FILE_MAX_SIZE:-10MB}</maxFileSize>
-            <!--日志文件保留天数，默认30天-->
-            <maxHistory>${LOG_FILE_MAX_HISTORY:-30}</maxHistory>
-        </rollingPolicy>
     </appender>
-
-    <!--DEBUG日志输出到LogStash-->
-<!--   <appender name="LOG_STASH_DEBUG" class="net.logstash.logback.appender.LogstashTcpSocketAppender">-->
-<!--        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">-->
-<!--            <level>DEBUG</level>-->
-<!--        </filter>-->
-<!--        <destination>${LOG_STASH_HOST}:4560</destination>-->
-<!--        <addDefaultStatusListener>${ENABLE_INNER_LOG}</addDefaultStatusListener>-->
-<!--        <encoder charset="UTF-8" class="net.logstash.logback.encoder.LoggingEventCompositeJsonEncoder">-->
-<!--            <providers>-->
-<!--                <timestamp>-->
-<!--                    <timeZone>Asia/Shanghai</timeZone>-->
-<!--                </timestamp>-->
-<!--                &lt;!&ndash;自定义日志输出格式&ndash;&gt;-->
-<!--                <pattern>-->
-<!--                    <pattern>-->
-<!--                        {-->
-<!--                        "project": "mall",-->
-<!--                        "level": "%level",-->
-<!--                        "service": "${APP_NAME:-}",-->
-<!--                        "pid": "${PID:-}",-->
-<!--                        "thread": "%thread",-->
-<!--                        "class": "%logger",-->
-<!--                        "message": "%message",-->
-<!--                        "stack_trace": "%exception{20}"-->
-<!--                        }-->
-<!--                    </pattern>-->
-<!--                </pattern>-->
-<!--            </providers>-->
-<!--        </encoder>-->
-<!--    </appender>-->
-
-    <!--ERROR日志输出到LogStash-->
-<!--    <appender name="LOG_STASH_ERROR" class="net.logstash.logback.appender.LogstashTcpSocketAppender">-->
-<!--        <filter class="ch.qos.logback.classic.filter.LevelFilter">-->
-<!--            <level>ERROR</level>-->
-<!--            <onMatch>ACCEPT</onMatch>-->
-<!--            <onMismatch>DENY</onMismatch>-->
-<!--        </filter>-->
-<!--        <destination>${LOG_STASH_HOST}:4561</destination>-->
-<!--        <addDefaultStatusListener>${ENABLE_INNER_LOG}</addDefaultStatusListener>-->
-<!--        <encoder charset="UTF-8" class="net.logstash.logback.encoder.LoggingEventCompositeJsonEncoder">-->
-<!--            <providers>-->
-<!--                <timestamp>-->
-<!--                    <timeZone>Asia/Shanghai</timeZone>-->
-<!--                </timestamp>-->
-<!--                &lt;!&ndash;自定义日志输出格式&ndash;&gt;-->
-<!--                <pattern>-->
-<!--                    <pattern>-->
-<!--                        {-->
-<!--                        "project": "mall",-->
-<!--                        "level": "%level",-->
-<!--                        "service": "${APP_NAME:-}",-->
-<!--                        "pid": "${PID:-}",-->
-<!--                        "thread": "%thread",-->
-<!--                        "class": "%logger",-->
-<!--                        "message": "%message",-->
-<!--                        "stack_trace": "%exception{20}"-->
-<!--                        }-->
-<!--                    </pattern>-->
-<!--                </pattern>-->
-<!--            </providers>-->
-<!--        </encoder>-->
-<!--    </appender>-->
-
-    <!--业务日志输出到LogStash-->
-<!--    <appender name="LOG_STASH_BUSINESS" class="net.logstash.logback.appender.LogstashTcpSocketAppender">-->
-<!--        <destination>${LOG_STASH_HOST}:4562</destination>-->
-<!--        <addDefaultStatusListener>${ENABLE_INNER_LOG}</addDefaultStatusListener>-->
-<!--        <encoder charset="UTF-8" class="net.logstash.logback.encoder.LoggingEventCompositeJsonEncoder">-->
-<!--            <providers>-->
-<!--                <timestamp>-->
-<!--                    <timeZone>Asia/Shanghai</timeZone>-->
-<!--                </timestamp>-->
-<!--                &lt;!&ndash;自定义日志输出格式&ndash;&gt;-->
-<!--                <pattern>-->
-<!--                    <pattern>-->
-<!--                        {-->
-<!--                        "project": "mall",-->
-<!--                        "level": "%level",-->
-<!--                        "service": "${APP_NAME:-}",-->
-<!--                        "pid": "${PID:-}",-->
-<!--                        "thread": "%thread",-->
-<!--                        "class": "%logger",-->
-<!--                        "message": "%message",-->
-<!--                        "stack_trace": "%exception{20}"-->
-<!--                        }-->
-<!--                    </pattern>-->
-<!--                </pattern>-->
-<!--            </providers>-->
-<!--        </encoder>-->
-<!--    </appender>-->
-
-    <!--接口访问记录日志输出到LogStash-->
-<!--    <appender name="LOG_STASH_RECORD" class="net.logstash.logback.appender.LogstashTcpSocketAppender">-->
-<!--        <destination>${LOG_STASH_HOST}:4563</destination>-->
-<!--        <addDefaultStatusListener>${ENABLE_INNER_LOG}</addDefaultStatusListener>-->
-<!--        <encoder charset="UTF-8" class="net.logstash.logback.encoder.LoggingEventCompositeJsonEncoder">-->
-<!--            <providers>-->
-<!--                <timestamp>-->
-<!--                    <timeZone>Asia/Shanghai</timeZone>-->
-<!--                </timestamp>-->
-<!--                &lt;!&ndash;自定义日志输出格式&ndash;&gt;-->
-<!--                <pattern>-->
-<!--                    <pattern>-->
-<!--                        {-->
-<!--                        "project": "mall",-->
-<!--                        "level": "%level",-->
-<!--                        "service": "${APP_NAME:-}",-->
-<!--                        "class": "%logger",-->
-<!--                        "message": "%message"-->
-<!--                        }-->
-<!--                    </pattern>-->
-<!--                </pattern>-->
-<!--            </providers>-->
-<!--        </encoder>-->
-<!--    </appender>-->
-
-    <!--控制框架输出日志-->
-    <logger name="org.slf4j" level="INFO"/>
-    <logger name="springfox" level="INFO"/>
-    <logger name="io.swagger" level="INFO"/>
-    <logger name="org.springframework" level="INFO"/>
-    <logger name="org.hibernate.validator" level="INFO"/>
-
-    <root level="DEBUG">
-        <appender-ref ref="CONSOLE"/>
-        <appender-ref ref="FILE_DEBUG"/>
-        <appender-ref ref="FILE_ERROR"/>
-<!--        <appender-ref ref="LOG_STASH_DEBUG"/>-->
-<!--        <appender-ref ref="LOG_STASH_ERROR"/>-->
+    <!-- <logger name="org.springframework.web" level="DEBUG"/> -->
+    <logger name="org.springframework" level="info"/>
+    <logger name="org.hibernate" level="info"/>
+    <logger name="druid.sql" level="info"/>
+    <!--        <logger name="druid.sql.ResultSet" level="info"/>-->
+    <!--        <logger name="com.png.central.mapper.ExtMapper" level="info"/>-->
+    <logger name="org.mybatis" level="info"/>
+    <logger name="org.apache.ibatis" level="info"/>
+    <logger name="io.netty" level="info"/>
+    <logger name="springfox.documentation" level="warn"/>
+    <logger name="org.apache.http" level="info"/>
+    <root level="debug">
+        <appender-ref ref="console"/>
+        <appender-ref ref="file"/>
     </root>
-
-<!--    <logger name="com.kym.charge.aspect.com.kym.common.SysLogAspect" level="DEBUG">-->
-<!--        <appender-ref ref="LOG_STASH_RECORD"/>-->
-<!--    </logger>-->
-
-<!--    <logger name="com.kym.charge" level="DEBUG">-->
-<!--        <appender-ref ref="LOG_STASH_BUSINESS"/>-->
-<!--    </logger>-->
-</configuration>
+</configuration>

service/src/main/java/com/kym/service/miniapp/impl/AttachmentServiceImpl.java

@@ -34,8 +34,6 @@ public class AttachmentServiceImpl extends ServiceImpl<AttachmentMapper, Attachm
     @Value("${upload.file.size}")
     private int fileSize;
 
-    @Autowired
-    private AttachmentMapper attachmentMapper;
 
     @Override
     public Attachment upload(MultipartFile file) throws IOException {
@@ -62,7 +60,7 @@ public class AttachmentServiceImpl extends ServiceImpl<AttachmentMapper, Attachm
         File storeFile = new File(dir,attachment.getUuid());
         file.transferTo(storeFile);
 
-        attachmentMapper.insert(attachment);
+        baseMapper.insert(attachment);
         return attachment;
     }
 }

service/src/main/java/com/kym/service/miniapp/impl/UserServiceImpl.java

@@ -75,7 +75,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
             var session_key = json.getString("session_key");
             var unionid = json.getString("unionid") == null ? "" : json.getString("unionid");
             // 判断有没有，没有就新增
-            var user = userMapper.selectOne(new QueryWrapper<User>().eq("openid", openid));
+            var user = baseMapper.selectOne(new QueryWrapper<User>().eq("openid", openid));
             if (user != null) {
                 // 登录逻辑
                 return handleLogin(user);