feat(*): 升级和对接新版会员

- 升级和对接新版会员

feat(*): 升级和对接新版会员
- 升级和对接新版会员
张志伟
1 parent 7b2c0e2f
Showing 7 changed files with 48 additions and 5 deletions
fw-hestia-domain/src/main/java/cn/fw/hestia/domain/vo/HistoryQuery.java
fw-hestia-server/src/main/java/cn/fw/hestia/server/controller/wx/MessageCenterController.java
fw-hestia-server/src/main/resources/application-dev.yml
fw-hestia-server/src/main/resources/application-local.yml
fw-hestia-server/src/main/resources/application-test.yml
fw-hestia-server/src/main/resources/spy.properties
pom.xml
 package cn.fw.hestia.domain.vo;
  
 import cn.fw.common.page.BasePageQuery;
+import cn.fw.common.web.annotation.PassportContextField;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
@@ -15,5 +16,9 @@ import lombok.ToString;
 @ToString(callSuper = true)
 @EqualsAndHashCode(callSuper = true)
 public class HistoryQuery extends BasePageQuery {
+    @PassportContextField(PassportContextField.Name.MEMBER_ID)
     private Long memberId;
+
+    @PassportContextField(PassportContextField.Name.ACCOUNT_ID)
+    private Long accId;
 }
@@ -55,8 +55,7 @@ public class MessageCenterController {
  
     @GetMapping("/query/history")
     @ControllerMethod("查询消息历史记录")
-    public Message<AppPage<MessageHistoryVO>> queryHistory(@CurrentUser PassportAuthBean user, HistoryQuery query) {
-        query.setMemberId(user.getUserId());
+    public Message<AppPage<MessageHistoryVO>> queryHistory(HistoryQuery query) {
         return success(messageCenterBizService.queryHistory(query));
     }
 }
@@ -19,4 +19,6 @@ logging:
     org.zalando.logbook: trace
 nacos:
   plugin:
-    namespace: df959b8c-de58-4d02-b9fb-d65ca3be05f3
 \ No newline at end of file
+    namespace: df959b8c-de58-4d02-b9fb-d65ca3be05f3
+p6spy-db:
+  url: jdbc:p6spy:mysql://192.168.0.234:3306/fw_hestia?characterEncoding=UTF-8&useSSL=false&rewriteBatchedStatements=true
 \ No newline at end of file
@@ -4,14 +4,27 @@ logging:
     max-size: 1GB
   level:
     root: info
-    cn.fw: DEBUG
+    cn.fw: info
     org.zalando.logbook: trace
 nacos:
   plugin:
     namespace: df959b8c-de58-4b02-b9fb-d65ca3be05f3
 spring:
+  cloud:
+    nacos:
+      discovery:
+        metadata:
+          grayTag: kurisu
+    inetutils:
+      preferred-networks:
+        - 10.8
   application:
     name: fw-hestia
+  datasource:
+    hikari:
+      connection-test-query: ''
+    driver-class-name: com.p6spy.engine.spy.P6SpyDriver
+    url: ${p6spy-db.url}
  
 task:
   switch: 'off'
@@ -49,3 +49,5 @@ logging:
  
 task:
   switch: 'on'
+p6spy-db:
+  url: jdbc:p6spy:mysql://172.26.154.169:3301/fw_hestia?characterEncoding=UTF-8&useSSL=false&rewriteBatchedStatements=true
 \ No newline at end of file
+#3.2.1????
+modulelist=com.baomidou.mybatisplus.extension.p6spy.MybatisPlusLogFactory,com.p6spy.engine.outage.P6OutageFactory
+# ???????
+logMessageFormat=com.baomidou.mybatisplus.extension.p6spy.P6SpyLogger
+#????????
+appender=com.baomidou.mybatisplus.extension.p6spy.StdoutLogger
+# ???????? sql
+#appender=com.p6spy.engine.spy.appender.Slf4JLogger
+# ?? p6spy driver ??
+deregisterdrivers=true
+# ??JDBC URL??
+useprefix=true
+# ???? Log ??,????????error,info,batch,debug,statement,commit,rollback,result,resultset.
+excludecategories=info,debug,result,commit,resultset
+# ????
+dateformat=yyyy-MM-dd HH:mm:ss
+# ???????
+#driverlist=org.h2.Driver
+# ?????SQL??
+outagedetection=true
+# ?SQL???? 2 ?
+outagedetectioninterval=2
@@ -12,7 +12,7 @@
     <parent>
         <groupId>cn.fw</groupId>
         <artifactId>fw-common-dependencies</artifactId>
-        <version>3.3.3</version>
+        <version>3.5.0</version>
     </parent>
  
     <modules>