membercard与member-reguster合并，能进行编译和启动

gym-manage-api/manage-app/pom.xml

@@ -38,6 +38,12 @@
             <artifactId>manage-db</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>cn.novalon.gym.manage</groupId>
+            <artifactId>gym-member</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-webflux</artifactId>
@@ -133,12 +139,6 @@
             <groupId>org.springdoc</groupId>
             <artifactId>springdoc-openapi-starter-webflux-ui</artifactId>
         </dependency>
-        <dependency>
-            <groupId>cn.novalon.gym.manage</groupId>
-            <artifactId>gym-member-card</artifactId>
-            <version>0.0.1-SNAPSHOT</version>
-            <scope>compile</scope>
-        </dependency>
     </dependencies>
 
     <build>

gym-manage-api/manage-app/src/main/java/cn/novalon/gym/manage/app/config/SystemRouter.java

@@ -1,23 +1,26 @@
 package cn.novalon.gym.manage.app.config;
 
-import cn.novalon.gym.manage.gymmembercard.handler.MemberCardHandler;
-import cn.novalon.gym.manage.gymmembercard.handler.MemberCardRecordHandler;
-import cn.novalon.gym.manage.gymmembercard.handler.MemberCardTransactionHandler;
-import cn.novalon.gym.manage.sys.handler.auth.SysAuthHandler;
-import cn.novalon.gym.manage.sys.handler.auth.PasswordDiagnosticHandler;
-import cn.novalon.gym.manage.sys.handler.config.SysConfigHandler;
-import cn.novalon.gym.manage.sys.handler.dictionary.DictionaryHandler;
-import cn.novalon.gym.manage.sys.handler.dict.SysDictHandler;
-import cn.novalon.gym.manage.sys.handler.log.SysLogHandler;
-import cn.novalon.gym.manage.sys.handler.log.OperationLogHandler;
-import cn.novalon.gym.manage.sys.handler.menu.MenuHandler;
-import cn.novalon.gym.manage.sys.handler.role.SysRoleHandler;
-import cn.novalon.gym.manage.sys.handler.permission.SysPermissionHandler;
-import cn.novalon.gym.manage.sys.handler.stats.StatsHandler;
-import cn.novalon.gym.manage.sys.handler.user.SysUserHandler;
+
+import cn.novalon.gym.manage.file.handler.SysFileHandler;
+import cn.novalon.gym.manage.member.card.handler.MemberCardHandler;
+import cn.novalon.gym.manage.member.card.handler.MemberCardRecordHandler;
+import cn.novalon.gym.manage.member.card.handler.MemberCardTransactionHandler;
+import cn.novalon.gym.manage.member.handler.MemberHandler;
+import cn.novalon.gym.manage.member.handler.WechatAuthHandler;
 import cn.novalon.gym.manage.notify.handler.SysNoticeHandler;
 import cn.novalon.gym.manage.notify.handler.SysUserMessageHandler;
-import cn.novalon.gym.manage.file.handler.SysFileHandler;
+import cn.novalon.gym.manage.sys.handler.auth.PasswordDiagnosticHandler;
+import cn.novalon.gym.manage.sys.handler.auth.SysAuthHandler;
+import cn.novalon.gym.manage.sys.handler.config.SysConfigHandler;
+import cn.novalon.gym.manage.sys.handler.dict.SysDictHandler;
+import cn.novalon.gym.manage.sys.handler.dictionary.DictionaryHandler;
+import cn.novalon.gym.manage.sys.handler.log.OperationLogHandler;
+import cn.novalon.gym.manage.sys.handler.log.SysLogHandler;
+import cn.novalon.gym.manage.sys.handler.menu.MenuHandler;
+import cn.novalon.gym.manage.sys.handler.permission.SysPermissionHandler;
+import cn.novalon.gym.manage.sys.handler.role.SysRoleHandler;
+import cn.novalon.gym.manage.sys.handler.stats.StatsHandler;
+import cn.novalon.gym.manage.sys.handler.user.SysUserHandler;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.reactive.function.server.RouterFunction;
@@ -54,6 +57,8 @@ public class SystemRouter {
             SysUserMessageHandler messageHandler,
             SysFileHandler fileHandler,
             SysPermissionHandler permissionHandler,
+            MemberHandler memberHandler,
+            WechatAuthHandler wechatAuthHandler,
             PasswordDiagnosticHandler passwordDiagnosticHandler,
             MemberCardHandler memberCardHandler,
             MemberCardRecordHandler memberCardRecordHandler,
@@ -199,6 +204,25 @@ public class SystemRouter {
                 .PUT("/api/permissions/{id}", permissionHandler::updatePermission)
                 .DELETE("/api/permissions/{id}", permissionHandler::deletePermission)
 
+                // ========== 会员模块路由 - 微信认证 ==========
+                .POST("/api/member/auth/miniapp/login", wechatAuthHandler::miniappLogin)
+                .GET("/api/member/auth/mp/callback", wechatAuthHandler::verifyMpSignature)
+                .POST("/api/member/auth/mp/callback", wechatAuthHandler::mpCallback)
+                
+                // ========== 会员模块路由 - 会员信息 ==========
+                .GET("/api/member/info", memberHandler::getMemberInfo)
+                .PUT("/api/member/info", memberHandler::updateMemberInfo)
+                .POST("/api/member/phone/bind", memberHandler::bindPhone)
+                .GET("/api/member/subscribe/status", memberHandler::checkSubscribeStatus)
+                
+                // ========== 会员模块路由 - 管理端 ==========
+                .POST("/api/admin/member/{id}/phone", memberHandler::adminUpdatePhone)
+                .GET("/api/admin/member/{id}", memberHandler::adminGetMemberInfo)
+                .PUT("/api/admin/member/{id}", memberHandler::adminUpdateMemberInfo)
+                .GET("/api/admin/members", memberHandler::searchMembers)
+                .GET("/api/admin/members/all", memberHandler::getAllMembers)
+
+
                 // ========================================
                 // ========== 会员卡管理路由 ==============
                 // ========================================

gym-manage-api/manage-app/src/main/resources/application-dev.yml

@@ -12,11 +12,15 @@ spring:
       max-life-time: 30m
       acquire-timeout: 3s
   flyway:
-    enabled: true
+    url: jdbc:postgresql://localhost:55432/manage_system
+    user: novalon
+    password: novalon123
+    enabled: false
     locations: classpath:db/migration
     baseline-on-migrate: true
     validate-on-migrate: true
 
+
 jwt:
   secret: novalon-gym-manage-jwt-secret-key-for-development-only-2026
   expiration: 86400000

gym-manage-api/manage-app/src/main/resources/application-local.yml

@@ -19,7 +19,7 @@ spring:
     password: 123456
     driver-class-name: org.postgresql.Driver
   flyway:
-    enabled: true
+    enabled: false
     locations: classpath:db/migration
     baseline-on-migrate: true
     baseline-version: 0

gym-manage-api/manage-app/src/main/resources/application-test.yml

@@ -15,7 +15,7 @@ spring:
       max-life-time: 1h
       acquire-timeout: 5s
   flyway:
-    enabled: true
+    enabled: false
     locations: classpath:db/migration
     baseline-on-migrate: true
     validate-on-migrate: true

gym-manage-api/manage-app/src/main/resources/application.yml

@@ -29,7 +29,7 @@ spring:
     password: ${DB_PASSWORD:postgres}
     driver-class-name: org.postgresql.Driver
   flyway:
-    enabled: true
+    enabled: false
     locations: classpath:db/migration
     baseline-on-migrate: true
     baseline-version: 0
@@ -38,6 +38,10 @@ spring:
     user:
       name: disabled
       password: disabled
+  profiles:
+    active: dev
+  config:
+    import: classpath:member-config.yml
 
 management:
   endpoints: