feat: rename directory wfc-modules-user to wfc-user

README.md

@@ -26,7 +26,7 @@ org.wfc
 │       └── wfc-common-swagger                      // 系统接口
 ├── wfc-modules                                     // 业务模块
 │       └── wfc-system                              // 系统模块 [9201]
-│       └── wfc-modules-user                        // 用户平台模块 [9208]
+│       └── wfc-user                                // 用户平台模块 [9208]
 │       └── wfc-gen                                 // 代码生成 [9202]
 │       └── wfc-job                                 // 定时任务 [9203]
 │       └── wfc-file                                // 文件服务 [9300]

docker/copy.bat

@@ -27,7 +27,7 @@ echo begin copy wfc-modules-system
 copy ..\wfc-modules\wfc-system\target\wfc-modules-system.jar .\wfc\modules\system\jar
 
 echo begin copy wfc-modules-user
-copy ..\wfc-modules\wfc-modules-user\target\wfc-modules-user.jar .\wfc\modules\user\jar
+copy ..\wfc-modules\wfc-user\target\wfc-modules-user.jar .\wfc\modules\user\jar
 
 echo begin copy wfc-modules-file
 copy ..\wfc-modules\wfc-file\target\wfc-modules-file.jar .\wfc\modules\file\jar

docker/copy.sh

@@ -39,7 +39,7 @@ echo "begin copy wfc-modules-system "
 cp ../wfc-modules/wfc-system/target/wfc-modules-system.jar ./wfc/modules/system/jar
 
 echo "begin copy wfc-modules-user "
-cp ../wfc-modules/wfc-modules-user/target/wfc-modules-user.jar ./wfc/modules/user/jar
+cp ../wfc-modules/wfc-user/target/wfc-modules-user.jar ./wfc/modules/user/jar
 
 echo "begin copy wfc-modules-file "
 cp ../wfc-modules/wfc-file/target/wfc-modules-file.jar ./wfc/modules/file/jar

wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/constant/ServiceNameConstants.java

@@ -26,5 +26,5 @@ public class ServiceNameConstants
     /**
      * 用户平台模块的 service_id
      */
-    public static final String USER_SERVICE = "wfc-modules-user";
+    public static final String USER_SERVICE = "wfc-user";
 }

wfc-gateway/src/main/resources/application.yml

@@ -49,10 +49,17 @@ spring:
           filters:
             - StripPrefix=1
         # 用户平台模块
-        - id: wfc-modules-user
+        - id: wfc-ser
-          uri: lb://wfc-modules-user
+          uri: lb://wfc-user
           predicates:
             - Path=/u/**
+          filters:
+            - StripPrefix=1            
+        # payment module
+        - id: wfc-payment
+          uri: lb://wfc-payment
+          predicates:
+            - Path=/payment/**
           filters:
             - StripPrefix=1
 

wfc-modules/pom.xml

@@ -13,7 +13,7 @@
         <module>wfc-gen</module>
         <module>wfc-job</module>
         <module>wfc-file</module>
-        <module>wfc-modules-user</module>
+        <module>wfc-user</module>
         <module>wfc-payment</module>
     </modules>
 

wfc-modules/wfc-payment/src/main/resources/application.yml

@@ -77,7 +77,7 @@ logging:
       github:
         binarywang: debug
   file:
-    name: /home/wfc/logs/wfc-payment.log
+    name: /opt/wfc/logs/wfc-payment.log
 
 wxpay:
     appId: 121412414112
@@ -85,5 +85,5 @@ wxpay:
     mchKey: 1525342aa
     subAppId: #服务商模式下的子商户公众账号ID
     subMchId: #服务商模式下的子商户号    
-    keyPath: /home/wfc/config/payment/wxpay_key.pem
+    keyPath: /opt/wfc/config/payment/wxpay_key.pem
     useSandboxEnv: false

wfc-modules/wfc-payment/src/main/resources/bootstrap.yml

@@ -1,6 +1,6 @@
 # Tomcat
 server:
-  port: 9401
+  port: ${WFC_PAYMENT_PORT:9204}
 
 # Spring
 spring:
@@ -14,11 +14,11 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: ${NACOS_SERVER_ADDR}
+        server-addr: wfc-nacos:${NACOS_SERVER_PORT}
         namespace: ${NACOS_NAME_SPACE}
       config:
         # 配置中心地址
-        server-addr: ${NACOS_SERVER_ADDR}
+        server-addr: wfc-nacos:${NACOS_SERVER_PORT}
         namespace: ${NACOS_NAME_SPACE}    
         # 配置文件格式
         file-extension: yml

wfc-modules/wfc-system/src/main/resources/bootstrap.yml

@@ -1,6 +1,6 @@
 # Tomcat
 server:
-  port: 9201
+  port: ${WFC_SYSTEM_PORT:9205}
 
 # Spring
 spring:
@@ -14,11 +14,11 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: ${NACOS_SERVER_ADDR}
+        server-addr: wfc-nacos:${NACOS_SERVER_PORT}
         namespace: ${NACOS_NAME_SPACE}
       config:
         # 配置中心地址
-        server-addr: ${NACOS_SERVER_ADDR}
+        server-addr: wfc-nacos:${NACOS_SERVER_PORT}
         namespace: ${NACOS_NAME_SPACE}
         # 配置文件格式
         file-extension: yml