Explorar o código

添加原始的配置

shuuufu hai 1 semana
pai
achega
983c8e560a

+ 150 - 0
upgrade_260806/nacos/pro/cardservice-pro.yaml

@@ -0,0 +1,150 @@
+server:
+  port: 10009
+  servlet:
+    encoding:
+      charset: UTF-8
+      force: true
+    context-path: /card
+  compression:
+    enabled: true #开启数据压缩
+    mime-types: application/json,application/xml,text/html,text/xml,text/plain
+    min-response-size: 2048
+logging:
+  file:
+    path: log/wookit
+  level:
+    root: info
+    "[javax.management]": INFO
+    "[org.apache.http]": INFO
+    "[org.apache.tomcat.util.net.NioEndpoint]": INFO
+    "[sun.rmi]": INFO
+    "[com.alibaba.nacos]": ERROR
+    tracer: trace # 开启trace级别日志,在开发时可以开启此配置,则控制台可以打印es全部请求信息及DSL语句,为了避免重复,开启此项配置后,可以将EE的print-dsl设置为false.
+
+spring:
+  application:
+    name: cardservice
+  cloud:
+    gateway:
+      discovery:
+        locator:
+          lower-case-service-id: true
+          enabled: true
+    nacos:
+      discovery:
+        server-addr: 10.16.0.49:8848
+        namespace: 02f60846-3747-424e-a598-2ea9e66dfe87
+
+  redis:
+    host: r-wz968zear8t0d8bkbg.redis.rds.aliyuncs.com #Redis服务器地址
+    database: 8 # Redis数据库索引(默认为0)
+    port: 6379 # Redis服务器连接端口
+    password: yn8Vh85rxvtUPnqB # Redis服务器连接密码(默认为空)
+    prefix: fsv2_pro
+    jedis:
+      pool:
+        max-active: 100 # 连接池最大连接数(使用负值表示没有限制)
+        max-wait: -1 # 连接池最大阻塞等待时间(使用负值表示没有限制)
+        max-idle: 20 # 连接池中的最大空闲连接
+        min-idle: 10 # 连接池中的最小空闲连接
+
+  datasource:
+    url: jdbc:mysql://rm-wz989u6pfs8lb7a22.mysql.rds.aliyuncs.com:3306/cardservice?useSSL=false&allowPublicKeyRetrieval=true&serverTimezone=GMT%2b8
+    username: fujicaV2user
+    password: BGbn4jP!mq4jxn@o4fQyp5*@
+    type: com.zaxxer.hikari.HikariDataSource
+    driver-class-name: com.mysql.cj.jdbc.Driver
+    validation-timeout: 3000
+    idle-timeout: 60000
+    minimum-idle: 30
+    read-only: false
+    connection-timeout: 60000 #请求连接的超时时间
+    maximum-pool-size: 100 #最大连接数量
+    max-lifetime: 1800000 #连接的最长生命周期
+    connection-test-query: SELECT 1
+
+
+#指定mybatis映射文件的地址
+mybatis:
+  mapper-locations: classpath:mapper/*.xml
+
+
+rocketmq:
+  name-server: 10.16.0.48:9876
+  producer:
+    group: fujica-producer
+    topic: 
+      topicDcEventAdd: topic_dc_event_add_pro
+      topicDcEventBatchAdd: topic_dc_event_batch_add_pro
+      topicPayRefund: topic_pay_refund_create_pro
+      cardEnterpriseParkRelationSync: sys_card_company_park_relation_pro
+  consumer:
+    topic: 
+      parkcardblacksheet: park_card_black_sheet_pro
+      parkcardlongleasecancel: park_card_long_lease_cancel_pro
+      parkcardlongleaseunfreeze: park_card_long_lease_unfreeze_pro
+      parkcardlongleasechange: park_card_long_lease_change_pro
+      parkcardlongleaserefund: park_card_long_lease_refund_pro
+      parkcardlongleaserenew: park_card_long_lease_renew_pro
+      parkcardlongleasefreeze: park_card_long_lease_freeze_pro
+      parkcardlongleaseinfo: park_card_long_lease_info_pro
+      parkcardtypeinfo: park_card_Billing_rule_pro
+      payresult: topic_pay_result_sync_card_pro
+      sysCustomerSync: topic_sys_customer_sync_pro
+      storedValueAccount: park_stored_value_account_pro
+      storedRechargeRecord: park_stored_value_recharge_pro
+      storedRefundRecord: park_stored_value_refund_pro
+      storedCancelRecord: park_stored_value_cancel_pro
+      storedConsumeRecord: park_stored_value_comsume_pro
+      storedPayResult: topic_pay_result_sync_stored_pro
+    group: 
+      parkcardblacksheet: park_card_black_sheet_pro
+      parkcardlongleasecancel: park_card_long_lease_cancel_pro
+      parkcardlongleaseunfreeze: park_card_long_lease_unfreeze_pro
+      parkcardlongleasechange: park_card_long_lease_change_pro
+      parkcardlongleaserefund: park_card_long_lease_refund_pro
+      parkcardlongleaserenew: park_card_long_lease_renew_pro
+      parkcardlongleasefreeze: park_card_long_lease_freeze_pro
+      parkcardlongleaseinfo: park_card_long_lease_info_pro
+      parkcardtypeinfo: park_card_Billing_rule_pro
+      payresult: topic_pay_result_sync_card_pro
+      sysCustomerSync: topic_sys_customer_sync_pro
+      storedValueAccount: park_stored_value_account_pro
+      storedRechargeRecord: park_stored_value_recharge_pro
+      storedRefundRecord: park_stored_value_refund_pro
+      storedCancelRecord: park_stored_value_cancel_pro
+      storedConsumeRecord: park_stored_value_comsume_pro
+      storedPayResult: topic_pay_result_sync_stored_pro
+      
+feign:
+  httpclient:
+    enabled: true #开启feign连接池
+    max-connections: 100
+    max-connections-per-route: 50
+  client:
+    config:
+      default:
+        connect-timeout: 2000 #默认连接超时时间
+        read-timeout: 8000 #默认请求超时时间
+      payCenterProxy: 
+        connect-timeout: 2000 #代理服务连接超时时间
+        read-timeout: 25000 #代理服务请求超时时
+
+async:
+  thread-pool: #为@Async功能配置的线程池
+    common: #卡服务通用线程池
+      core-pool-size: 2
+      max-pool-size: 2
+      queue-capacity: 1000
+      name-prefix: card
+
+xxl:
+  job:
+    admin:
+      addresses: http://10.16.0.49:8088/xxl-job-admin
+    executor:
+      appname: cardservice
+      address:
+      port: 9999
+      logretentiondays: 30
+    accessToken: default_token

+ 111 - 0
upgrade_260806/nacos/pro/chargeservice-pro.yaml

@@ -0,0 +1,111 @@
+server:
+  port: 10005
+  servlet:
+    encoding:
+      charset: UTF-8
+      force: true
+    context-path: /charge
+  compression:
+    enabled: true #开启数据压缩
+    mime-types: application/json,application/xml,text/html,text/xml,text/plain
+    min-response-size: 2048
+logging:
+  file:
+    path: log/wookit
+  level:
+    root: info
+    "[javax.management]": INFO
+    "[org.apache.http]": INFO
+    "[org.apache.tomcat.util.net.NioEndpoint]": INFO
+    "[sun.rmi]": INFO
+    "[com.alibaba.nacos]": ERROR
+    tracer: trace # 开启trace级别日志,在开发时可以开启此配置,则控制台可以打印es全部请求信息及DSL语句,为了避免重复,开启此项配置后,可以将EE的print-dsl设置为false.
+
+spring:
+  application:
+    name: chargeservice
+  cloud:
+    gateway:
+      discovery:
+        locator:
+          lower-case-service-id: true
+          enabled: true
+    nacos:
+      discovery:
+        server-addr: 10.16.0.49:8848
+        namespace: 02f60846-3747-424e-a598-2ea9e66dfe87
+
+  redis:
+    host: r-wz968zear8t0d8bkbg.redis.rds.aliyuncs.com #Redis服务器地址
+    database: 4 # Redis数据库索引(默认为0)
+    port: 6379 # Redis服务器连接端口
+    password: yn8Vh85rxvtUPnqB # Redis服务器连接密码(默认为空)
+    jedis:
+      pool:
+        max-active: 100 # 连接池最大连接数(使用负值表示没有限制)
+        max-wait: -1 # 连接池最大阻塞等待时间(使用负值表示没有限制)
+        max-idle: 20 # 连接池中的最大空闲连接
+        min-idle: 10 # 连接池中的最小空闲连接
+  datasource:
+    url: jdbc:mysql://rm-wz989u6pfs8lb7a22.mysql.rds.aliyuncs.com:3306/chargeservice?useSSL=false&allowPublicKeyRetrieval=true&serverTimezone=GMT%2b8
+    username: fujicaV2user
+    password: BGbn4jP!mq4jxn@o4fQyp5*@
+    type: com.zaxxer.hikari.HikariDataSource
+    driver-class-name: com.mysql.cj.jdbc.Driver
+    validation-timeout: 3000
+    idle-timeout: 60000
+    minimum-idle: 30
+    read-only: false
+    connection-timeout: 60000 #请求连接的超时时间
+    maximum-pool-size: 200 #最大连接数量
+    max-lifetime: 1800000 #连接的最长生命周期
+    connection-test-query: select 1 #连接验证sql
+  main:
+    allow-bean-definition-overriding: true
+
+
+#指定mybatis映射文件的地址
+mybatis:
+  mapper-locations: classpath:mapper/*.xml
+ 
+
+rocketmq:
+  name-server: 10.16.0.48:9876
+  producer:
+    group: fujica-producer
+    topic:
+      topicDcEventAdd: topic_dc_event_add_pro
+      topicDcServiceUpdate: topic_dc_service_update_pro
+      topicExPushParkCarFeeOrder: ex_park_car_fee_order_pro
+  consumer:
+    topic: 
+      chargeResult: park_charge_result_pro
+      payResultSync: topic_pay_result_sync_parking_pro
+    group: 
+      chargeResult: park_charge_result_pro
+      payResultSync: topic_pay_result_sync_parking_pro
+
+feign:
+  httpclient:
+    enabled: true #开启feign连接池
+    max-connections: 100
+    max-connections-per-route: 50
+  client:
+    config:
+      default:
+        connect-timeout: 2000 #默认连接超时时间
+        read-timeout: 8000 #默认请求超时时间
+      payCenterProxy: 
+        connect-timeout: 2000 #代理服务连接超时时间
+        read-timeout: 25000 #代理服务请求超时时
+  
+xxl:
+  job:
+    admin:
+      addresses: http://10.16.0.49:8088/xxl-job-admin
+    executor:
+      appname: chargeservice
+      address:
+      port: 9999
+      logretentiondays: 30
+    accessToken: default_token

+ 106 - 0
upgrade_260806/nacos/pro/dataservice-pro.yaml

@@ -0,0 +1,106 @@
+server:
+  port: 10013
+  servlet:
+    encoding:
+      charset: UTF-8
+      force: true
+    context-path: /data
+  compression:
+    enabled: true #开启数据压缩
+    mime-types: application/json,application/xml,text/html,text/xml,text/plain
+    min-response-size: 2048
+logging:
+  file:
+    path: log/wookit
+  level:
+    root: INFO
+    "[javax.management]": INFO
+    "[org.apache.http]": INFO
+    "[org.apache.tomcat.util.net.NioEndpoint]": INFO
+    "[sun.rmi]": INFO
+    "[com.alibaba.nacos]": ERROR
+    #"[org.mongodb.driver.protocol.command]": DEBUG
+    tracer: trace # 开启trace级别日志,在开发时可以开启此配置,则控制台可以打印es全部请求信息及DSL语句,为了避免重复,开启此项配置后,可以将EE的print-dsl设置为false.
+
+spring:
+  application:
+    name: dataservice
+  cloud:
+    gateway:
+      discovery:
+        locator:
+          lower-case-service-id: true
+          enabled: true
+    nacos:
+      discovery:
+        server-addr: 10.16.0.49:8848
+        namespace: 02f60846-3747-424e-a598-2ea9e66dfe87
+
+  redis:
+    host: r-wz968zear8t0d8bkbg.redis.rds.aliyuncs.com #Redis服务器地址
+    database: 10 # Redis数据库索引(默认为0)
+    port: 6379 # Redis服务器连接端口
+    password: yn8Vh85rxvtUPnqB # Redis服务器连接密码(默认为空)
+    jedis:
+      pool:
+        max-active: 100 # 连接池最大连接数(使用负值表示没有限制)
+        max-wait: -1 # 连接池最大阻塞等待时间(使用负值表示没有限制)
+        max-idle: 20 # 连接池中的最大空闲连接
+        min-idle: 10 # 连接池中的最小空闲连接
+  data:
+    mongodb:
+      uri: mongodb://root:U5Z0Y0fneQnjH3Xj4lENpW0D@dds-wz92ac81710b54241.mongodb.rds.aliyuncs.com:3717,dds-wz92ac81710b54242.mongodb.rds.aliyuncs.com:3717/fujica_data_center?replicaSet=mgset-77298810&authSource=admin&connectTimeoutMS=10000&serverSelectionTimeoutMS=10000&socketTimeoutMS=20000
+rocketmq:
+  name-server: 10.16.0.48:9876
+  producer:
+    group: fujica-producer
+  consumer:
+    topic: 
+      topicDcEventAdd: topic_dc_event_add_pro
+      topicDcEventBatchAdd: topic_dc_event_batch_add_pro
+      topicDcServiceAdd: topic_dc_service_add_pro
+      topicDcServiceBatchAdd: topic_dc_service_batch_add_pro
+      topicDcServiceBatchDel: topic_dc_service_batch_del_pro
+      topicDcServiceBatchUpdate: topic_dc_service_batch_update_pro
+      topicDcServiceDel: topic_dc_service_del_pro
+      topicDcServiceUpdate: topic_dc_service_update_pro
+    group: 
+      topicDcEventAdd: topic_dc_event_add_pro
+      topicDcEventBatchAdd: topic_dc_event_batch_add_pro
+      topicDcServiceAdd: topic_dc_service_add_pro
+      topicDcServiceBatchAdd: topic_dc_service_batch_add_pro
+      topicDcServiceBatchDel: topic_dc_service_batch_del_pro
+      topicDcServiceBatchUpdate: topic_dc_service_batch_update_pro
+      topicDcServiceDel: topic_dc_service_del_pro
+      topicDcServiceUpdate: topic_dc_service_update_pro
+
+xxl:
+  job:
+    admin:
+      addresses: http://10.16.0.49:8088/xxl-job-admin
+    executor:
+      appname: dataservice
+      address:
+      port: 9999
+      logretentiondays: 30
+    accessToken: default_token
+
+feign:
+  httpclient:
+    enabled: true #开启feign连接池
+    max-connections: 100
+    max-connections-per-route: 50
+  client:
+    config:
+      default:
+        connect-timeout: 2000 #默认连接超时时间
+        read-timeout: 8000 #默认请求超时时间
+      payCenterProxy: 
+        connect-timeout: 2000 #代理服务连接超时时间
+        read-timeout: 25000 #代理服务请求超时时
+
+async:
+  corePoolSize: 2
+  maxPoolSize: 8
+  queueCapacity: 1000
+  namePrefix: async-service-

+ 190 - 0
upgrade_260806/nacos/pro/inoutservice-pro.yaml

@@ -0,0 +1,190 @@
+server:
+  port: 10011
+  servlet:
+    encoding:
+      charset: UTF-8
+      force: true
+    context-path: /inout
+  compression:
+    enabled: true #开启数据压缩
+    mime-types: application/json,application/xml,text/html,text/xml,text/plain
+    min-response-size: 2048
+logging:
+  file:
+    path: log/wookit
+  level:
+    root: info
+    "[javax.management]": INFO
+    "[org.apache.http]": INFO
+    "[org.apache.tomcat.util.net.NioEndpoint]": INFO
+    "[sun.rmi]": INFO
+    "[com.alibaba.nacos]": ERROR
+    tracer: trace # 开启trace级别日志,在开发时可以开启此配置,则控制台可以打印es全部请求信息及DSL语句,为了避免重复,开启此项配置后,可以将EE的print-dsl设置为false.
+
+spring:
+  application:
+    name: inoutservice
+  cloud:
+    gateway:
+      discovery:
+        locator:
+          lower-case-service-id: true
+          enabled: true
+    nacos:
+      discovery:
+        server-addr: 10.16.0.49:8848
+        namespace: 02f60846-3747-424e-a598-2ea9e66dfe87
+
+  redis:
+    host: r-wz968zear8t0d8bkbg.redis.rds.aliyuncs.com #Redis服务器地址
+    database: 9 # Redis数据库索引(默认为0)
+    port: 6379 # Redis服务器连接端口
+    password: yn8Vh85rxvtUPnqB # Redis服务器连接密码(默认为空)
+    jedis:
+      pool:
+        max-active: 100 # 连接池最大连接数(使用负值表示没有限制)
+        max-wait: -1 # 连接池最大阻塞等待时间(使用负值表示没有限制)
+        max-idle: 20 # 连接池中的最大空闲连接
+        min-idle: 10 # 连接池中的最小空闲连接
+  shardingsphere:
+    props:
+      sql-show: false
+    datasource:
+      ds0:
+        username: fujicaV2user
+        password: BGbn4jP!mq4jxn@o4fQyp5*@
+        url: jdbc:mysql://rm-wz989u6pfs8lb7a22.mysql.rds.aliyuncs.com:3306/inoutservice?useSSL=false&allowPublicKeyRetrieval=true&serverTimezone=GMT%2b8
+        type: com.zaxxer.hikari.HikariDataSource
+        driver-class-name: com.mysql.cj.jdbc.Driver
+        validation-timeout: 3000
+        idle-timeout: 60000
+        minimum-idle: 30
+        read-only: false
+        connection-timeout: 60000 #请求连接的超时时间
+        maximum-pool-size: 200 #最大连接数量
+        max-lifetime: 1800000 #连接的最长生命周期
+        connection-test-query: select 1 #连接验证sql
+      names: ds0
+    rules:
+      sharding:
+        sharding-algorithms:
+          # 分表算法
+          table-parkin:
+            type: INLINE
+            props:
+              algorithm-expression: io_park_in_$->{Math.abs(project_no.hashCode()%10) +1}
+          table-parkout:
+            type: INLINE
+            props:
+              algorithm-expression: io_park_out_$->{Math.abs(project_no.hashCode()%10) +1}
+
+        tables:
+          io_park_in:
+            actual-data-nodes: ds0.io_park_in_$->{1..10}
+            key-generate-strategy:
+              column: project_no
+              key-generator-name: projectuuid
+            # 分表策略
+            table-strategy:
+              standard:
+                sharding-column: project_no
+                sharding-algorithm-name: table-parkin
+          io_park_out:
+            actual-data-nodes: ds0.io_park_out_$->{1..10}
+            key-generate-strategy:
+              column: project_no
+              key-generator-name: projectuuid
+            # 分表策略
+            table-strategy:
+              standard:
+                sharding-column: project_no
+                sharding-algorithm-name: table-parkout
+        key-generators:
+          projectuuid:
+            type: UUID
+    mode:
+      type: Standalone
+
+
+#指定mybatis映射文件的地址
+mybatis:
+  mapper-locations: classpath:mapper/*.xml
+
+
+rocketmq:
+  name-server: 10.16.0.48:9876
+  producer:
+    group: fujica-producer
+    topic: 
+      topicDcEventAdd: topic_dc_event_add_pro
+      topicDcEventBatchAdd: topic_dc_event_batch_add_pro
+      topicExPushParkIn: ex_park_in_data_pro
+      topicExPushParkInRecord: ex_park_in_record_pro
+      topicExPushParkOut: ex_park_out_data_pro
+      topicExPushModifyPlate: ex_modify_plate_data_pro
+      topicExPushFinishOrder: ex_finish_order_pro
+      topicExPushDeleteParkIn: ex_delete_park_in_pro
+      topicExPushParkCarFeeOrder: ex_park_car_fee_order_pro
+      topicDcServiceUpdate: topic_dc_service_update_pro
+  consumer:
+    topic: 
+      parkInRecord: park_in_record_pro
+      parkCarFeeOrder: park_car_fee_order_pro
+      parkDeleteInRecords: park_delete_inRecords_pro
+      parkEventRecord: park_event_record_pro
+      parkFinishOrder: park_finish_order_pro
+      parkFollowRecord: park_follow_record_pro
+      parkFollowPayStatus: park_follow_payStatus_pro
+      parkInRecordBatch: park_in_record_batch_pro
+      parkInRecordLockStatus: park_inRecord_lockStatus_pro
+      parkInRecordOffLine: park_in_record_offline_pro
+      parkModifyPlate: park_modify_plate_pro
+      parkOutRecord: park_out_record_pro
+      parkOutRecordOffline: park_out_record_offline_pro
+      parkSupplementInRecord: park_supplement_in_record_pro
+      topicExPushParkIn: push_park_in_data_pro
+      topicExPushParkOut: push_park_out_data_pro
+      parkModifyInModel: park_modify_in_model_pro
+      topicExPushModifyPlate: push_modify_plate_data_pro
+      parkGateOperateRecord: park_gate_operate_record_pro
+    group: 
+      parkInRecord: park_in_record_pro
+      parkCarFeeOrder: park_car_fee_order_pro
+      parkDeleteInRecords: park_delete_inRecords_pro
+      parkEventRecord: park_event_record_pro
+      parkFinishOrder: park_finish_order_pro
+      parkFollowRecord: park_follow_record_pro
+      parkFollowPayStatus: park_follow_payStatus_pro
+      parkInRecordBatch: park_in_record_batch_pro
+      parkInRecordLockStatus: park_inRecord_lockStatus_pro
+      parkInRecordOffLine: park_in_record_offline_pro
+      parkModifyPlate: park_modify_plate_pro
+      parkOutRecord: park_out_record_pro
+      parkOutRecordOffline: park_out_record_offline_pro
+      parkSupplementInRecord: park_supplement_in_record_pro
+      topicExPushParkIn: push_park_in_data_pro
+      topicExPushParkOut: push_park_out_data_pro
+      parkModifyInModel: park_modify_in_model_pro
+      topicExPushModifyPlate: push_modify_plate_data_pro
+      parkGateOperateRecord: park_gate_operate_record_pro
+
+async:
+  corePoolSize: 20
+  maxPoolSize: 20
+  queueCapacity: 1000
+  namePrefix: async-service-
+
+
+feign:
+  httpclient:
+    enabled: true #开启feign连接池
+    max-connections: 100
+    max-connections-per-route: 50
+  client:
+    config:
+      default:
+        connect-timeout: 2000 #默认连接超时时间
+        read-timeout: 8000 #默认请求超时时间
+      payCenterProxy: 
+        connect-timeout: 2000 #代理服务连接超时时间
+        read-timeout: 25000 #代理服务请求超时时

+ 196 - 0
upgrade_260806/nacos/pro/parkservice-pro.yaml

@@ -0,0 +1,196 @@
+server:
+  port: 10002
+  servlet:
+    encoding:
+      charset: UTF-8
+      force: true
+    context-path: /park
+  compression:
+    enabled: true #开启数据压缩
+    mime-types: application/json,application/xml,text/html,text/xml,text/plain
+    min-response-size: 2048
+logging:
+  file:
+    path: log/wookit
+  level:
+    root: info
+    "[javax.management]": INFO
+    "[org.apache.http]": INFO
+    "[org.apache.tomcat.util.net.NioEndpoint]": INFO
+    "[sun.rmi]": INFO
+    "[com.alibaba.nacos]": ERROR
+    tracer: trace # 开启trace级别日志,在开发时可以开启此配置,则控制台可以打印es全部请求信息及DSL语句,为了避免重复,开启此项配置后,可以将EE的print-dsl设置为false.
+
+spring:
+  application:
+    name: parkservice
+  cloud:
+    gateway:
+      discovery:
+        locator:
+          lower-case-service-id: true
+          enabled: true
+    nacos:
+      discovery:
+        server-addr: 10.16.0.49:8848
+        namespace: 02f60846-3747-424e-a598-2ea9e66dfe87
+
+  redis:
+    host: r-wz968zear8t0d8bkbg.redis.rds.aliyuncs.com #Redis服务器地址
+    database: 2 # Redis数据库索引(默认为0)
+    port: 6379 # Redis服务器连接端口
+    password: yn8Vh85rxvtUPnqB # Redis服务器连接密码(默认为空)
+    prefix: fsv2_pro
+    jedis:
+      pool:
+        max-active: 100 # 连接池最大连接数(使用负值表示没有限制)
+        max-wait: -1 # 连接池最大阻塞等待时间(使用负值表示没有限制)
+        max-idle: 20 # 连接池中的最大空闲连接
+        min-idle: 10 # 连接池中的最小空闲连接
+
+  datasource:
+    url: jdbc:mysql://rm-wz989u6pfs8lb7a22.mysql.rds.aliyuncs.com:3306/parkservice?useSSL=false&allowPublicKeyRetrieval=true&serverTimezone=GMT%2b8
+    username: fujicaV2user
+    password: BGbn4jP!mq4jxn@o4fQyp5*@
+    type: com.zaxxer.hikari.HikariDataSource
+    driver-class-name: com.mysql.cj.jdbc.Driver
+    validation-timeout: 3000
+    idle-timeout: 60000
+    minimum-idle: 30
+    read-only: false
+    connection-timeout: 60000 #请求连接的超时时间
+    maximum-pool-size: 100 #最大连接数量
+    max-lifetime: 1800000 #连接的最长生命周期
+    connection-test-query: SELECT 1
+
+#指定mybatis映射文件的地址
+mybatis:
+  mapper-locations: classpath:mapper/*.xml
+
+
+park:
+  qrcode:
+    img-width: 400
+    img-height: 400
+    decode-url: https://gw.fujica.com.cn/transfer/mobile/qrcode/decode #二维码解码地址
+    err-page-url: https://fsabk.fujica.com.cn/pages/h5/errorPage #解析到错误二维码跳转地址
+    types:
+      - type: 1
+        url: https://fsabk.fujica.com.cn/pages/pay/paycost
+        name: 场内码
+      - type: 2
+        url: https://fsabk.fujica.com.cn/pages/h5/parkIn
+        name: 入口码
+      - type: 3
+        url: https://fsabk.fujica.com.cn/pages/pay/pay 
+        name: 出口码
+      - type: 4
+        url: https://fsabk.fujica.com.cn/pages/pay/getCoupon
+        name: 减免领取码(静态)
+      - type: 5
+        url: https://fsabk.fujica.com.cn/pages/pay/getCoupon
+        name: 减免领取码(动态)
+        save-mode: 2 #存redis
+      - type: 6
+        url: https://fsabk.fujica.com.cn/pages/h5/assignPlate
+        name: 获取虚拟车牌
+      - type: 7
+        url: http://www.baidu.com
+        name: 缴费机找零
+      - type: 8
+        url: https://fsabk.fujica.com.cn/map
+        name: 反向寻车
+
+rocketmq:
+  name-server: 10.16.0.48:9876
+  producer:
+    group: fujica-producer
+    topic:
+      topicParkInfo: topic_park_info_pro
+      topicParkPlace: topic_park_place_pro
+      topicParkLane: topic_park_lane_pro
+      dc: #数据中心主题配置
+        eventAdd: topic_dc_event_add_pro
+        eventBatchAdd: topic_dc_event_batch_add_pro
+        serviceAdd: topic_dc_service_add_pro
+        serviceBatchAdd: topic_dc_service_batch_add_pro
+        serviceBatchDelete: topic_dc_service_batch_del_pro
+        serviceBatchUpdate: topic_dc_service_batch_update_pro
+        serviceDelete: topic_dc_service_del_pro
+        serviceUpdate: topic_dc_service_update_pro
+
+  consumer:
+    topic: 
+      parkResiduePlace: park_residue_place_pro
+      reserveRealTime: park_reserve_realtime_pro
+      projectOnlineStatus: topic_project_online_status_pro
+      controlGateResult: park_gate_operate_result_pro
+      upPlaceInoutCar: upplaceinoutcar_sync_pro
+      placeReserve: place_reserve_v2_pro
+      placeReserveE8Confirm: park_book_e8_confirm_pro
+      placeReserveLockResult: park_reserve_lock_result_pro
+      payresult: topic_pay_result_sync_reserve_pro
+      topicExPushParkIn: ex_park_in_data_pro
+      topicExPushParkOut: ex_park_out_data_pro
+      parkBookPrepaidFee: park_book_prepaid_fee_pro
+      parkBookPrepaidFeeNotice: park_book_prepaid_fee_notice_pro
+      parkBookPrepaidFeeRefund: park_book_prepaid_fee_refund_pro
+      parkLaneStatus: park_lane_status_pro
+      payrefundresult: topic_pay_refund_sync_pro
+      temopayresult: topic_pay_result_sync_parking_pro
+    group: 
+      parkResiduePlace: park_residue_place_pro
+      reserveRealTime: park_reserve_realtime_pro
+      projectOnlineStatus: topic_project_online_status_pro
+      controlGateResult: park_gate_operate_result_pro
+      upPlaceInoutCar: upplaceinoutcar_sync_pro
+      placeReserve: place_reserve_v2_pro
+      placeReserveE8Confirm: park_book_e8_confirm_pro
+      placeReserveLockResult: park_reserve_lock_result_pro
+      payresult: topic_pay_result_sync_reserve_pro
+      topicExPushParkIn: ex_park_in_data_park_pro
+      topicExPushParkOut: ex_park_out_data_park_pro
+      parkBookPrepaidFee: park_book_prepaid_fee_pro
+      parkBookPrepaidFeeNotice: park_book_prepaid_fee_notice_pro
+      parkBookPrepaidFeeRefund: park_book_prepaid_fee_refund_pro
+      parkLaneStatus: park_lane_status_pro
+      payrefundresult: topic_pay_refund_sync_pro
+      temopayresult: book_topic_pay_result_sync_parking_pro
+
+async:
+  thread-pool: #为@Async功能配置的线程池
+    park: #车场通用线程池
+      core-pool-size: 2
+      max-pool-size: 10
+      queue-capacity: 1000
+      name-prefix: park
+xxl:
+  job:
+    admin:
+      addresses: http://10.16.0.49:8088/xxl-job-admin
+    executor:
+      appname: parkservice
+      address:
+      port: 9999
+      logretentiondays: 30
+    accessToken: default_token
+
+feign:
+  httpclient:
+    enabled: true #开启feign连接池
+    max-connections: 100
+    max-connections-per-route: 50
+  client:
+    config:
+      default:
+        connect-timeout: 2000 #默认连接超时时间
+        read-timeout: 8000 #默认请求超时时间
+      payCenterProxy: 
+        connect-timeout: 2000 #代理服务连接超时时间
+        read-timeout: 25000 #代理服务请求超时时
+external:
+  api:
+    reservation-base-url: fscarpointsystem:30130
+    park-info-sync-url: /park/tparklist/addBatch
+    connect-timeout: 5000
+    read-timeout: 10000

+ 162 - 0
upgrade_260806/nacos/pro/reductionservice-pro.yaml

@@ -0,0 +1,162 @@
+server:
+  port: 10007
+  servlet:
+    encoding:
+      charset: UTF-8
+      force: true
+    context-path: /reduction
+  compression:
+    enabled: true #开启数据压缩
+    mime-types: application/json,application/xml,text/html,text/xml,text/plain
+    min-response-size: 2048
+logging:
+  file:
+    path: log/wookit
+  level:
+    root: info
+    "[javax.management]": INFO
+    "[org.apache.http]": INFO
+    "[org.apache.tomcat.util.net.NioEndpoint]": INFO
+    "[sun.rmi]": INFO
+    "[com.alibaba.nacos]": ERROR
+    tracer: trace # 开启trace级别日志,在开发时可以开启此配置,则控制台可以打印es全部请求信息及DSL语句,为了避免重复,开启此项配置后,可以将EE的print-dsl设置为false.
+
+spring:
+  application:
+    name: reductionservice
+  cloud:
+    gateway:
+      discovery:
+        locator:
+          lower-case-service-id: true
+          enabled: true
+    nacos:
+      discovery:
+        server-addr: 10.16.0.49:8848
+        namespace: 02f60846-3747-424e-a598-2ea9e66dfe87
+
+  redis:
+    host: r-wz968zear8t0d8bkbg.redis.rds.aliyuncs.com #Redis服务器地址
+    database: 6 # Redis数据库索引(默认为0)
+    port: 6379 # Redis服务器连接端口
+    password: yn8Vh85rxvtUPnqB # Redis服务器连接密码(默认为空)
+    jedis:
+      pool:
+        max-active: 100 # 连接池最大连接数(使用负值表示没有限制)
+        max-wait: -1 # 连接池最大阻塞等待时间(使用负值表示没有限制)
+        max-idle: 20 # 连接池中的最大空闲连接
+        min-idle: 10 # 连接池中的最小空闲连接
+
+  datasource:
+    url: jdbc:mysql://rm-wz989u6pfs8lb7a22.mysql.rds.aliyuncs.com:3306/reductionservice?useSSL=false&allowPublicKeyRetrieval=true&serverTimezone=GMT%2b8
+    username: fujicaV2user
+    password: BGbn4jP!mq4jxn@o4fQyp5*@
+    type: com.zaxxer.hikari.HikariDataSource
+    driver-class-name: com.mysql.cj.jdbc.Driver
+    validation-timeout: 3000
+    idle-timeout: 60000
+    minimum-idle: 30
+    read-only: false
+    connection-timeout: 60000 #请求连接的超时时间
+    maximum-pool-size: 200 #最大连接数量
+    max-lifetime: 1800000 #连接的最长生命周期
+    connection-test-query: select 1 #连接验证sql
+  
+  jackson:
+    time-zone: GMT+8
+    date-format: yyyy-MM-dd HH:mm:ss
+
+    default-property-inclusion: NON_NULL
+    serialization:
+      WRITE_DATES_AS_TIMESTAMPS: false
+      fail-on-empty-beans: false
+
+
+#指定mybatis映射文件的地址
+mybatis:
+  mapper-locations: classpath*:mapper/*.xml
+
+#特来电
+telaidian:
+  operatorID: 395815801
+  operatorSecret: WJLl3phtlBNBak0p
+  sigSecret: LvbyJyrAoXOvWCBL
+  dataSecret: 5QHCkDEXRAvVRkNZ
+  dataSecretIV: OHIAiIXYIvPivFSM
+  operatorIDForPark: 760481427
+  mainUrl: https://hlht.teld.cn/evcs/v20161110
+  accessToken: kVnStIRknCCOBdXgJrmu8rb3pcccifKW2NcQrysKKIzb7iQBxkkjeq3WoGdjgrIL
+
+#小桔充电
+xiaoju:
+  signKey: 6d505fb04c0d495c8712fa4d5c972434
+  appKey: ig/vFInn02swHPMZccuf1QyH6iWm8sZZkMwXqelnEFQ=
+  appSecret: tKLXRx9h9i4jpMHGgbQYVtFl34QSkt8I3Gf7RDpUDEw=
+  apiUrl: https://gw.am.xiaojukeji.com/parking/gateway/standardModel/pushWaiverResult
+
+#特斯拉
+tesla:
+  apiUrl:  123
+  publicKey: 123123
+  preferredUsername:  123
+  
+#星星充电
+star:
+  operatorID: 313744932
+  mainUrl: http://parking.ccchong.com/parking/
+  pushResultUrl: query_parking_discount_result
+  queryResultUrl: query_parking_charge_result
+  
+
+pagehelper:
+  reasonable: false
+  pageSizeZero: false
+  defaultCount: true
+
+async:
+  corePoolSize: 5
+  maxPoolSize: 10
+  queueCapacity: 20
+  namePrefix: async-service-
+
+rocketmq:
+  name-server: 10.16.0.48:9876
+  producer:
+    group: fujica-producer
+    topic:
+      topicDcEventAdd: topic_dc_event_add_pro
+      topicDcEventBatchAdd: topic_dc_event_batch_add_pro
+      topicPayRefund: topic_pay_refund_create_pro
+      topicDcEventUpdate: topic_dc_service_update_pro
+
+  consumer:
+    topic:
+      parkCarAuthResult: park_car_auth_result_pro
+      payResult: topic_pay_result_sync_merchant_pro
+      topicExPushParkIn: ex_park_in_data_pro
+      topicExPushParkOut: ex_park_out_data_pro
+      parkPromotionRecordResult: park_promotion_record_result_pro
+    group:
+      parkCarAuthResult: park_car_auth_result_pro
+      payResult: pay_result_sync_merchant_pro
+      topicExPushParkIn: rd_ex_park_in_data_pro
+      topicExPushParkOut: rd_ex_park_out_data_pro
+      parkPromotionRecordResult: park_promotion_record_result_pro
+
+qrcode:
+ pageurl: https://fsp.fujica.com.cn/#/qrCode
+
+
+feign:
+  httpclient:
+    enabled: true #开启feign连接池
+    max-connections: 100
+    max-connections-per-route: 50
+  client:
+    config:
+      default:
+        connect-timeout: 2000 #默认连接超时时间
+        read-timeout: 8000 #默认请求超时时间
+      payCenterProxy: 
+        connect-timeout: 2000 #代理服务连接超时时间
+        read-timeout: 25000 #代理服务请求超时时

+ 185 - 0
upgrade_260806/nacos/pro/systemservice-pro.yaml

@@ -0,0 +1,185 @@
+server:
+  port: 10010
+  servlet:
+    encoding:
+      charset: UTF-8
+      force: true
+    context-path: /sys
+  compression:
+    enabled: true #开启数据压缩
+    mime-types: application/json,application/xml,text/html,text/xml,text/plain
+    min-response-size: 2048
+logging:
+  file:
+    path: log/wookit
+  level:
+    root: info
+    "[javax.management]": INFO
+    "[org.apache.http]": INFO
+    "[org.apache.tomcat.util.net.NioEndpoint]": INFO
+    "[sun.rmi]": INFO
+    "[com.alibaba.nacos]": ERROR
+    tracer: trace # 开启trace级别日志,在开发时可以开启此配置,则控制台可以打印es全部请求信息及DSL语句,为了避免重复,开启此项配置后,可以将EE的print-dsl设置为false.
+
+spring:
+  application:
+    name: systemservice
+  cloud:
+    gateway:
+      discovery:
+        locator:
+          lower-case-service-id: true
+          enabled: true
+    nacos:
+      discovery:
+        server-addr: 10.16.0.49:8848
+        namespace: 02f60846-3747-424e-a598-2ea9e66dfe87
+
+  redis:
+    host: r-wz968zear8t0d8bkbg.redis.rds.aliyuncs.com #Redis服务器地址
+    database: 1 # Redis数据库索引(默认为0)
+    port: 6379 # Redis服务器连接端口
+    password: yn8Vh85rxvtUPnqB # Redis服务器连接密码(默认为空)
+    prefix: fsv2_pro
+    jedis:
+      pool:
+        max-active: 100 # 连接池最大连接数(使用负值表示没有限制)
+        max-wait: -1 # 连接池最大阻塞等待时间(使用负值表示没有限制)
+        max-idle: 20 # 连接池中的最大空闲连接
+        min-idle: 10 # 连接池中的最小空闲连接
+
+  datasource:
+    url: jdbc:mysql://rm-wz989u6pfs8lb7a22.mysql.rds.aliyuncs.com:3306/systemservice?useSSL=false&allowPublicKeyRetrieval=true&serverTimezone=GMT%2b8
+    username: fujicaV2user
+    password: BGbn4jP!mq4jxn@o4fQyp5*@
+    type: com.zaxxer.hikari.HikariDataSource
+    driver-class-name: com.mysql.cj.jdbc.Driver
+    validation-timeout: 3000
+    idle-timeout: 60000
+    minimum-idle: 30
+    read-only: false
+    connection-timeout: 60000 #请求连接的超时时间
+    maximum-pool-size: 100 #最大连接数量
+    max-lifetime: 1800000 #连接的最长生命周期
+    connection-test-query: SELECT 1
+
+  # data:
+  #   mongodb:
+  #     uri: mongodb://fujica:Fujica123@10.0.3.221:31017/fujica_data_center?authSource=admin
+
+jwt:
+  access-token-expire: 86400
+  access-token-secret: 123456
+  refresh-token-expire: 86400
+  refresh-token-secret: 123456
+  app-access-token-expire: 2592000 #爱泊客小程序、H5登录有效期(30天)
+
+mybatis:
+  mapper-locations: classpath:/mapper/*.xml
+  configuration:
+    map-underscore-to-camel-case: true
+  type-handlers-package:
+    com.fujica.util
+# 阿里云OSS
+# 不同服务器地址不同
+aliyun:
+  oss:
+    file:
+      endpoint: https://oss-cn-shenzhen.aliyuncs.com
+      keyid: LTAI5tALFygbdLmGw1VsDEVw
+      keysecret: wVJnGaeR8hkxvdnjr2lIzAWlZGVxTG
+      bucketname: forv2-prod
+
+feign:
+  httpclient:
+    enabled: true #开启feign连接池
+    max-connections: 100
+    max-connections-per-route: 50
+  client:
+    config:
+      default:
+        connect-timeout: 2000 #默认连接超时时间
+        read-timeout: 8000 #默认请求超时时间
+      payCenterProxy: 
+        connect-timeout: 2000 #代理服务连接超时时间
+        read-timeout: 25000 #代理服务请求超时时
+
+fujica:
+  sha256:
+    salt: fujica2024v2
+  rsa:
+    publicKey: MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMkyd3UWDgDyk70PlCrQJimVswNV8zk8d5DvVpvjtCW3xVuXOACHDQDUsFgHYh/B8A43eADR6+2b/776Bz/ZhjUCAwEAAQ==
+    privateKey: MIIBVQIBADANBgkqhkiG9w0BAQEFAASCAT8wggE7AgEAAkEAyTJ3dRYOAPKTvQ+UKtAmKZWzA1XzOTx3kO9Wm+O0JbfFW5c4AIcNANSwWAdiH8HwDjd4ANHr7Zv/vvoHP9mGNQIDAQABAkAFONca5eClK6akAJSC6/YhnC4SRxfSA3zC+UNRNn7Ff8y/3fzhPjzQa9Fg+5kM9gEQylRDTBfFeBpArr5xk9udAiEA9uoWCJFJQYWDE7Xqv9bQszGuSf/ezuKCRa73H1E/1H8CIQDQmbpDRAfBwCcM759pw3DbhOK4EXN6uFg53n9ZqVM7SwIhAPPFspEs11VP+lQ4c5aJAC0abId0jcZVjOY9Uo/hyJIDAiEAs1fHvTdLF/f1WvjVbJ/ccs8wASL3zsWZDL/Pa63ZYjsCIF9qoBzAEka+ZbRoxvcI9pLx7GFFCvkbOrDlvC+vZO3s
+  login:
+    h5:
+      allowChangeMobileCount: 1 #每天允许变更一次手机号
+      sms:
+        code: SMS_468400780
+        length: 4
+        expireTime: 60
+    common:
+      needVerifyCode: true
+  password:
+    sms:
+      code: SMS_468630113
+  oss:
+    baseUrl: http://192.168.12.131:8080/sys/file/redirect?ossKey=
+rocketmq:
+  name-server: 10.16.0.48:9876
+  producer:
+    group: fujica-producer
+    topic: 
+      topicDcEventAdd: topic_dc_event_add_pro
+      topicDcEventBatchAdd: topic_dc_event_batch_add_pro
+      topicSysCustomerSync: topic_sys_customer_sync_pro
+      topicProjectOnlineStatus: topic_project_online_status_pro
+      orgSync: sys_org_sync_pro
+      delOrgSync: sys_del_org_sync_pro
+      customerSync: sys_customer_sync_pro
+      delCustomerSync: sys_del_customer_sync_pro
+      areSync: sys_area_sync_pro
+      delAreaSync: sys_del_area_sync_pro
+  consumer:
+    topic:
+      sysAreaBatchDelete: sys_area_batch_delete_pro
+      sysAreaBatch: sys_area_batch_pro
+      sysArea: sys_area_pro
+      sysCustomerBatchDelete: sys_customer_batch_delete_pro
+      sysCustomerBatch: sys_customer_batch_pro
+      sysCustomer: sys_customer_pro
+      sysOrgBatchDelete: sys_org_batch_delete_pro
+      sysOrgBatch: sys_org_batch_pro
+      sysOrg: sys_org_pro
+      mqttOnlineStatus: mqtt_push_data_pro
+      bindMemberOpenId: topic_bind_member_openid_pro
+      statReplace: stat_replace_pro
+      statMerge: stat_merge_pro 
+      externalCallback: vms_external_callback_pro
+      sysCardCompanyParkRelation: sys_card_company_park_relation_pro
+    group:
+      sysAreaBatchDelete: sys_area_batch_delete_pro
+      sysAreaBatch: sys_area_batch_pro
+      sysArea: sys_area_pro
+      sysCustomerBatchDelete: sys_customer_batch_delete_pro
+      sysCustomerBatch: sys_customer_batch_pro
+      sysCustomer: sys_customer_pro
+      sysOrgBatchDelete: sys_org_batch_delete_pro
+      sysOrgBatch: sys_org_batch_pro
+      sysOrg: sys_org_pro
+      mqttOnlineStatus: mqtt_online_status_pro
+      bindMemberOpenId: topic_bind_member_openid_pro
+      statReplace: stat_replace_pro
+      statMerge: stat_merge_pro
+      externalCallback: vms_external_callback_pro
+      sysCardCompanyParkRelation: sys_card_company_park_relation_pro
+async:
+  thread-pool:
+    sys:
+      core-pool-size: 2
+      max-pool-size: 2
+      queue-capacity: 1000
+      name-prefix: sys
+
+member:
+  plate:
+    limit: 10 #会员最多允许添加车辆数

+ 108 - 0
upgrade_260806/nacos/pro/transferservice-pro.yaml

@@ -0,0 +1,108 @@
+server:
+  port: 10004
+  servlet:
+    encoding:
+      charset: UTF-8
+      force: true
+    #context-path: /transfer
+  compression:
+    enabled: true #开启数据压缩
+    mime-types: application/json,application/xml,text/html,text/xml,text/plain
+    min-response-size: 2048
+logging:
+  file:
+    path: log/wookit
+  level:
+    root: info
+    "[javax.management]": INFO
+    "[org.apache.http]": INFO
+    "[org.apache.tomcat.util.net.NioEndpoint]": INFO
+    "[sun.rmi]": INFO
+    "[com.alibaba.nacos]": ERROR
+    tracer: trace # 开启trace级别日志,在开发时可以开启此配置,则控制台可以打印es全部请求信息及DSL语句,为了避免重复,开启此项配置后,可以将EE的print-dsl设置为false.
+  enable-print-get-method-resp-data: false #是否打印Get请求响应数据
+
+spring:
+  application:
+    name: transferservice
+  cloud:
+    gateway:
+      discovery:
+        locator:
+          lower-case-service-id: true
+          enabled: true
+    nacos:
+      discovery:
+        server-addr: 10.16.0.49:8848
+        namespace: 02f60846-3747-424e-a598-2ea9e66dfe87
+
+  redis:
+    host: r-wz968zear8t0d8bkbg.redis.rds.aliyuncs.com #Redis服务器地址
+    database: 3 # Redis数据库索引(默认为0)
+    port: 6379 # Redis服务器连接端口
+    password: yn8Vh85rxvtUPnqB # Redis服务器连接密码(默认为空)
+    jedis:
+      pool:
+        max-active: 100 # 连接池最大连接数(使用负值表示没有限制)
+        max-wait: -1 # 连接池最大阻塞等待时间(使用负值表示没有限制)
+        max-idle: 20 # 连接池中的最大空闲连接
+        min-idle: 10 # 连接池中的最小空闲连接
+
+feign:
+  httpclient:
+    enabled: true #开启feign连接池
+    max-connections: 100
+    max-connections-per-route: 50
+  client:
+    config:
+      default:
+        connect-timeout: 2000 #默认连接超时时间
+        read-timeout: 8000 #默认请求超时时间
+      payCenterProxy: 
+        connect-timeout: 2000 #代理服务连接超时时间
+        read-timeout: 25000 #代理服务请求超时时
+      dataservice: 
+        connect-timeout: 2000 #代理服务连接超时时间
+        read-timeout: 25000 #代理服务请求超时时
+      
+
+aliyun:
+  oss:
+    endpoint: https://oss-cn-shenzhen.aliyuncs.com
+    keyid: LTAI5tALFygbdLmGw1VsDEVw
+    keysecret: wVJnGaeR8hkxvdnjr2lIzAWlZGVxTG
+    bucketname: forv2-prod
+
+fujica:
+  sha256:
+    salt: fujica2024v2
+  rsa:
+    publicKey: MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMkyd3UWDgDyk70PlCrQJimVswNV8zk8d5DvVpvjtCW3xVuXOACHDQDUsFgHYh/B8A43eADR6+2b/776Bz/ZhjUCAwEAAQ==
+    privateKey: MIIBVQIBADANBgkqhkiG9w0BAQEFAASCAT8wggE7AgEAAkEAyTJ3dRYOAPKTvQ+UKtAmKZWzA1XzOTx3kO9Wm+O0JbfFW5c4AIcNANSwWAdiH8HwDjd4ANHr7Zv/vvoHP9mGNQIDAQABAkAFONca5eClK6akAJSC6/YhnC4SRxfSA3zC+UNRNn7Ff8y/3fzhPjzQa9Fg+5kM9gEQylRDTBfFeBpArr5xk9udAiEA9uoWCJFJQYWDE7Xqv9bQszGuSf/ezuKCRa73H1E/1H8CIQDQmbpDRAfBwCcM759pw3DbhOK4EXN6uFg53n9ZqVM7SwIhAPPFspEs11VP+lQ4c5aJAC0abId0jcZVjOY9Uo/hyJIDAiEAs1fHvTdLF/f1WvjVbJ/ccs8wASL3zsWZDL/Pa63ZYjsCIF9qoBzAEka+ZbRoxvcI9pLx7GFFCvkbOrDlvC+vZO3s
+xss:
+  enabled: true
+  exclude:
+    - /transfer/mobile/system/**
+    - /callback/wx/**
+
+
+async:
+  thread-pool: #为@Async功能配置的线程池
+    common: #通用线程池
+      core-pool-size: 1
+      max-pool-size: 5
+      queue-capacity: 1000
+      name-prefix: transfer
+
+zhuhai-credit:
+  secret-key: 6-VS2BfJS-kd7bONs-wA2KG_BbDH567s
+
+
+# 地址参数
+domain:
+  v2:
+    orderDetailUrl: https://fsabk.fujica.com.cn/pages/pay/pay #缴费详情页URL
+    invoiceUrl: https://fsabk.fujica.com.cn/pages/common/carSearch?to=/pages/mine/order/index&token=B61FCADD07E7479EAA91B0167FED0048
+  e7:
+    orderDetailUrl: http://mops.fujica.com.cn/v3/login/index?key=FUJICA97
+    invoiceUrl: http://mops.fujica.com.cn/v3/login/index?key=FUJICA97&redictType=18

+ 101 - 0
upgrade_260806/nacos/test/boxgateway-test.yaml

@@ -0,0 +1,101 @@
+server:
+  port: 10000
+  servlet:
+    encoding:
+      charset: UTF-8
+      force: true
+  compression:
+    enabled: true #开启数据压缩
+    mime-types: application/json,application/xml,text/html,text/xml,text/plain
+    min-response-size: 2048
+logging:
+  file:
+    path: log/wookit
+  level:
+    root: info
+    "[javax.management]": INFO
+    "[org.apache.http]": INFO
+    "[org.apache.tomcat.util.net.NioEndpoint]": INFO
+    "[sun.rmi]": INFO
+    "[com.alibaba.nacos]": ERROR
+    "[com.netflix]": ERROR
+    tracer: trace # 开启trace级别日志,在开发时可以开启此配置,则控制台可以打印es全部请求信息及DSL语句,为了避免重复,开启此项配置后,可以将EE的print-dsl设置为false.
+
+auth:
+  access-token-secret: 123456
+  anonymous: #匿名访问配置
+    - /**/qrcode/down
+    - /**/send/SmsCode/**
+    - /**/verifyCode
+    - /**/login
+    - /**/favicon.ico
+    - /**/swagger-resources/**
+    - /**/v2/api-docs
+    - /**/doc.html
+    - /**/webjars/**
+    - /box/user/**
+    - /box/ws/**
+  permit:
+    
+spring:
+  application:
+    name: boxgateway
+  cloud:
+    gateway:
+      x-forwarded:
+        prefix-enabled: false #解决swagger自动添加前缀问题
+      discovery:
+        locator:
+          lower-case-service-id: true
+          enabled: true
+      routes:
+        - id: deviceservice
+          uri: lb://deviceservice
+          metadata:
+            request-source: "device"
+          predicates:
+            - Path=/device/**
+        - id: parkservice
+          uri: lb://parkservice
+          metadata:
+            request-source: "park"
+          predicates:
+            - Path=/park/**
+        - id: cardservice
+          uri: lb://cardservice
+          metadata:
+            request-source: "card"
+          predicates:
+            - Path=/card/**
+        - id: systemservice
+          uri: lb://systemservice
+          metadata:
+            request-source: "sys"
+          predicates:
+            - Path=/sys/**
+        - id: boxservice
+          uri: lb://boxservice
+          metadata:
+            request-source: "box"
+          predicates:
+            - Path=/box/**
+        - id: ws-boxservice
+          uri: lb://boxservice
+          predicates:
+            - Path=/box/ws/**  # WebSocket路径匹配
+    nacos:
+      discovery:
+        server-addr: 192.168.2.92:8848
+        namespace: 49ab56f7-3752-4c43-a935-a1d4024eb82b
+  redis:
+    host: 192.168.2.92 #Redis服务器地址
+    database: 1 # Redis数据库索引(默认为0)
+    port: 6379 # Redis服务器连接端口
+    password: Fjc@2025 # Redis服务器连接密码(默认为空)
+    prefix: fsv2_test
+    jedis:
+      pool:
+        max-active: 8 # 连接池最大连接数(使用负值表示没有限制)
+        max-wait: -1 # 连接池最大阻塞等待时间(使用负值表示没有限制)
+        max-idle: 8 # 连接池中的最大空闲连接
+        min-idle: 0 # 连接池中的最小空闲连接

+ 125 - 0
upgrade_260806/nacos/test/boxservice-test.yaml

@@ -0,0 +1,125 @@
+server:
+  port: 10019
+  servlet:
+    encoding:
+      charset: UTF-8
+      force: true
+    context-path: /box
+  compression:
+    enabled: true #开启数据压缩
+    mime-types: application/json,application/xml,text/html,text/xml,text/plain
+    min-response-size: 2048
+logging:
+  file:
+    path: log/wookit
+  level:
+    root: INFO
+    "[javax.management]": INFO
+    "[org.apache.http]": INFO
+    "[org.apache.tomcat.util.net.NioEndpoint]": INFO
+    "[sun.rmi]": INFO
+    "[com.alibaba.nacos]": ERROR
+    tracer: trace # 开启trace级别日志,在开发时可以开启此配置,则控制台可以打印es全部请求信息及DSL语句,为了避免重复,开启此项配置后,可以将EE的print-dsl设置为false.
+
+spring:
+  application:
+    name: boxservice
+  cloud:
+    gateway:
+      discovery:
+        locator:
+          lower-case-service-id: true
+          enabled: false
+    nacos:
+      discovery:
+        server-addr: 192.168.2.92:8848
+        namespace: 49ab56f7-3752-4c43-a935-a1d4024eb82b
+      config:
+        enabled: false
+
+  redis:
+    host: 192.168.2.92 #Redis服务器地址
+    database: 3 # Redis数据库索引(默认为0)
+    port: 6379 # Redis服务器连接端口
+    password: Fjc@2025 # Redis服务器连接密码(默认为空)
+    prefix: fsv2_test
+    jedis:
+      pool:
+        max-active: 8 # 连接池最大连接数(使用负值表示没有限制)
+        max-wait: -1 # 连接池最大阻塞等待时间(使用负值表示没有限制)
+        max-idle: 8 # 连接池中的最大空闲连接
+        min-idle: 0 # 连接池中的最小空闲连接
+
+  datasource:
+    url: jdbc:mysql://192.168.2.93:3306/test_boxservice?useSSL=false&serverTimezone=GMT%2b8
+    username: fujica
+    password: Fjc@2025
+
+jwt:
+  access-token-expire: 3600000
+  access-token-secret: 123456
+  refresh-token-expire: 3600000
+  refresh-token-secret: 123456
+  app-access-token-expire: 2592000 #爱泊客小程序、H5登录有效期(30天)
+
+mybatis:
+  mapper-locations: classpath:/mapper/*.xml
+  configuration:
+    map-underscore-to-camel-case: true
+  type-handlers-package:
+    com.fujica.util
+# 阿里云OSS
+# 不同服务器地址不同
+aliyun:
+  oss:
+    endpoint: https://oss-cn-shenzhen.aliyuncs.com
+    keyid: LTAI5tALFygbdLmGw1VsDEVw
+    keysecret: wVJnGaeR8hkxvdnjr2lIzAWlZGVxTG
+    bucketname: fsbase
+fujica:
+  sha256:
+    salt: fujica2024v2
+  rsa:
+    publicKey: MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMkyd3UWDgDyk70PlCrQJimVswNV8zk8d5DvVpvjtCW3xVuXOACHDQDUsFgHYh/B8A43eADR6+2b/776Bz/ZhjUCAwEAAQ==
+    privateKey: MIIBVQIBADANBgkqhkiG9w0BAQEFAASCAT8wggE7AgEAAkEAyTJ3dRYOAPKTvQ+UKtAmKZWzA1XzOTx3kO9Wm+O0JbfFW5c4AIcNANSwWAdiH8HwDjd4ANHr7Zv/vvoHP9mGNQIDAQABAkAFONca5eClK6akAJSC6/YhnC4SRxfSA3zC+UNRNn7Ff8y/3fzhPjzQa9Fg+5kM9gEQylRDTBfFeBpArr5xk9udAiEA9uoWCJFJQYWDE7Xqv9bQszGuSf/ezuKCRa73H1E/1H8CIQDQmbpDRAfBwCcM759pw3DbhOK4EXN6uFg53n9ZqVM7SwIhAPPFspEs11VP+lQ4c5aJAC0abId0jcZVjOY9Uo/hyJIDAiEAs1fHvTdLF/f1WvjVbJ/ccs8wASL3zsWZDL/Pa63ZYjsCIF9qoBzAEka+ZbRoxvcI9pLx7GFFCvkbOrDlvC+vZO3s
+feign:
+  httpclient:
+    enabled: true #开启feign连接池
+    max-connections: 100
+    max-connections-per-route: 50
+  client:
+    config:
+      default:
+        connect-timeout: 2000 #默认连接超时时间
+        read-timeout: 8000 #默认请求超时时间
+
+rocketmq:
+  name-server: 192.168.16.20:9876;192.168.16.21:9876;192.168.16.22:9876
+  producer:
+    group: fujica-producer
+  consumer:
+    topic:
+      parkAuthResult: parkauth_event_test
+      parkEventRecord: park_event_record_test
+      parkGateOperateResult: park_gate_operate_result_test
+      gpioInput: gpio_input_event_test
+      deviceOnlineStatus: topic_device_status_test
+      gpioDeviceStatus: gpio_device_status_test
+    group:
+      parkAuthResult: box_park_car_auth_result_test
+      parkEventRecord: box_park_event_record_test
+      parkGateOperateResult: box_park_gate_operate_result_test
+      gpioInput: box_gpio_input_event_test
+      deviceOnlineStatus: box_topic_device_status_test
+      gpioDeviceStatus: box_gpio_device_status_test
+
+xxl:
+  job:
+    admin:
+      addresses: http://192.168.2.92:8089/xxl-job-admin
+    executor:
+      appname: boxservice
+      address:
+      port: 9999
+      logretentiondays: 30
+    accessToken: default_token

+ 148 - 0
upgrade_260806/nacos/test/cardservice-test.yaml

@@ -0,0 +1,148 @@
+server:
+  port: 10009
+  servlet:
+    encoding:
+      charset: UTF-8
+      force: true
+    context-path: /card
+  compression:
+    enabled: true #开启数据压缩
+    mime-types: application/json,application/xml,text/html,text/xml,text/plain
+    min-response-size: 2048
+logging:
+  file:
+    path: log/wookit
+  level:
+    root: info
+    "[javax.management]": INFO
+    "[org.apache.http]": INFO
+    "[org.apache.tomcat.util.net.NioEndpoint]": INFO
+    "[sun.rmi]": INFO
+    "[com.alibaba.nacos]": ERROR
+    tracer: trace # 开启trace级别日志,在开发时可以开启此配置,则控制台可以打印es全部请求信息及DSL语句,为了避免重复,开启此项配置后,可以将EE的print-dsl设置为false.
+
+spring:
+  application:
+    name: cardservice
+  cloud:
+    gateway:
+      discovery:
+        locator:
+          lower-case-service-id: true
+          enabled: true
+    nacos:
+      discovery:
+        server-addr: 192.168.2.92:8848
+        namespace: 49ab56f7-3752-4c43-a935-a1d4024eb82b
+
+  redis:
+    host: 192.168.2.92 #Redis服务器地址
+    database: 8 # Redis数据库索引(默认为0)
+    port: 6379 # Redis服务器连接端口
+    password: Fjc@2025 # Redis服务器连接密码(默认为空)
+    prefix: fsv2_test
+    jedis:
+      pool:
+        max-active: 8 # 连接池最大连接数(使用负值表示没有限制)
+        max-wait: -1 # 连接池最大阻塞等待时间(使用负值表示没有限制)
+        max-idle: 8 # 连接池中的最大空闲连接
+        min-idle: 0 # 连接池中的最小空闲连接
+
+  datasource:
+    url: jdbc:mysql://192.168.2.93:3306/test_cardservice?useSSL=false&serverTimezone=GMT%2b8
+    username: fujica
+    password: Fjc@2025
+
+
+#指定mybatis映射文件的地址
+mybatis:
+  mapper-locations: classpath:mapper/*.xml
+  configuration:
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl 
+
+rocketmq:
+  name-server: 192.168.16.20:9876;192.168.16.21:9876;192.168.16.22:9876
+  producer:
+    group: fujica-producer
+    topic: 
+      topicDcEventAdd: topic_dc_event_add_test
+      topicDcEventBatchAdd: topic_dc_event_batch_add_test
+      topicPayRefund: topic_pay_refund_create_test
+      cardEnterpriseParkRelationSync: sys_card_company_park_relation_test
+      topicDcServiceBatchUpdate: topic_dc_service_batch_update_test
+      deviceCommand: parkauth_device_command_test
+  consumer:
+    topic: 
+      parkcardblacksheet: park_card_black_sheet_test      
+      parkcardlongleasecancel: park_card_long_lease_cancel_test
+      parkcardlongleaseunfreeze: park_card_long_lease_unfreeze_test
+      parkcardlongleasechange: park_card_long_lease_change_test
+      parkcardlongleaserefund: park_card_long_lease_refund_test
+      parkcardlongleaserenew: park_card_long_lease_renew_test
+      parkcardlongleasefreeze: park_card_long_lease_freeze_test
+      parkcardlongleaseinfo: park_card_long_lease_info_test
+      parkcardtypeinfo: park_card_Billing_rule_test
+      payresult: topic_pay_result_sync_card_test
+      sysCustomerSync: topic_sys_customer_sync_test
+      storedValueAccount: park_stored_value_account_test
+      storedRechargeRecord: park_stored_value_recharge_test
+      storedRefundRecord: park_stored_value_refund_test
+      storedCancelRecord: park_stored_value_cancel_test
+      storedConsumeRecord: park_stored_value_comsume_test
+      storedPayResult: topic_pay_result_sync_stored_test
+
+    group: 
+      parkcardblacksheet: park_card_black_sheet_test
+      parkcardlongleasecancel: park_card_long_lease_cancel_test
+      parkcardlongleaseunfreeze: park_card_long_lease_unfreeze_test
+      parkcardlongleasechange: park_card_long_lease_change_test
+      parkcardlongleaserefund: park_card_long_lease_refund_test
+      parkcardlongleaserenew: park_card_long_lease_renew_test
+      parkcardlongleasefreeze: park_card_long_lease_freeze_test
+      parkcardlongleaseinfo: park_card_long_lease_info_test
+      parkcardtypeinfo: park_card_Billing_rule_test
+      payresult: topic_pay_result_sync_card_test
+      sysCustomerSync: topic_sys_customer_sync_test
+      storedValueAccount: park_stored_value_account_test
+      storedRechargeRecord: park_stored_value_recharge_test
+      storedRefundRecord: park_stored_value_refund_test
+      storedCancelRecord: park_stored_value_cancel_test
+      storedConsumeRecord: park_stored_value_comsume_test
+      storedPayResult: topic_pay_result_sync_stored_test
+
+feign:
+  httpclient:
+    enabled: true #开启feign连接池
+    max-connections: 100
+    max-connections-per-route: 50
+  client:
+    config:
+      default:  
+        connect-timeout: 1000 #默认连接超时时间
+        read-timeout: 5000 #默认请求超时时间
+
+
+async:
+  thread-pool: #为@Async功能配置的线程池
+    common: #卡服务通用线程池
+      core-pool-size: 1
+      max-pool-size: 1
+      queue-capacity: 100
+      name-prefix: card
+
+
+xxl:
+  job:
+    admin:
+      addresses: http://192.168.2.92:8089/xxl-job-admin
+    executor:
+      appname: cardservice
+      address:
+      port: 9999
+      logretentiondays: 30
+    accessToken: default_token
+
+
+month-card:
+  bloom-filter:
+    rebuild-on-startup: true

+ 118 - 0
upgrade_260806/nacos/test/chargeservice-test.yaml

@@ -0,0 +1,118 @@
+server:
+  port: 10005
+  servlet:
+    encoding:
+      charset: UTF-8
+      force: true
+    context-path: /charge
+  compression:
+    enabled: true #开启数据压缩
+    mime-types: application/json,application/xml,text/html,text/xml,text/plain
+    min-response-size: 2048
+logging:
+  file:
+    path: log/wookit
+  level:
+    root: info
+    "[javax.management]": INFO
+    "[org.apache.http]": INFO
+    "[org.apache.tomcat.util.net.NioEndpoint]": INFO
+    "[sun.rmi]": INFO
+    "[com.alibaba.nacos]": ERROR
+    tracer: trace # 开启trace级别日志,在开发时可以开启此配置,则控制台可以打印es全部请求信息及DSL语句,为了避免重复,开启此项配置后,可以将EE的print-dsl设置为false.
+
+spring:
+  application:
+    name: chargeservice
+  cloud:
+    gateway:
+      discovery:
+        locator:
+          lower-case-service-id: true
+          enabled: true
+    nacos:
+      discovery:
+        server-addr: 192.168.2.92:8848
+        namespace: 49ab56f7-3752-4c43-a935-a1d4024eb82b
+
+  redis:
+    host: 192.168.2.92 #Redis服务器地址
+    database: 4 # Redis数据库索引(默认为0)
+    port: 6379 # Redis服务器连接端口
+    password: Fjc@2025 # Redis服务器连接密码(默认为空)
+    jedis:
+      pool:
+        max-active: 8 # 连接池最大连接数(使用负值表示没有限制)
+        max-wait: -1 # 连接池最大阻塞等待时间(使用负值表示没有限制)
+        max-idle: 8 # 连接池中的最大空闲连接
+        min-idle: 0 # 连接池中的最小空闲连接
+  datasource:
+    url: jdbc:mysql://192.168.2.93:3306/test_chargeservice?useSSL=false&serverTimezone=GMT%2b8
+    username: fujica
+    password: Fjc@2025
+    type: com.zaxxer.hikari.HikariDataSource
+    driver-class-name: com.mysql.cj.jdbc.Driver
+    validation-timeout: 3000
+    idle-timeout: 60000
+    minimum-idle: 30
+    read-only: false
+    connection-timeout: 60000 #请求连接的超时时间
+    maximum-pool-size: 1000 #最大连接数量
+    max-lifetime: 1800000 #连接的最长生命周期
+    connection-test-query: select 1 #连接验证sql
+  main:
+    allow-bean-definition-overriding: true
+
+
+#指定mybatis映射文件的地址
+mybatis:
+  mapper-locations: classpath:mapper/*.xml
+  configuration:
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl 
+
+rocketmq:
+  name-server: 192.168.16.20:9876;192.168.16.21:9876;192.168.16.22:9876
+  producer:
+    group: fujica-producer
+    topic:
+      topicDcEventAdd: topic_dc_event_add_test
+      topicDcServiceUpdate: topic_dc_service_update_test
+      topicExPushParkCarFeeOrder: ex_park_car_fee_order_test
+      parkCarFeeOrder: park_car_fee_order_test
+  consumer:
+    topic: 
+      chargeResult: park_charge_result_test
+      payResultSync: topic_pay_result_sync_parking_test
+    group: 
+      chargeResult: park_charge_result_test
+      payResultSync: topic_pay_result_sync_parking_test
+
+feign:
+  httpclient:
+    enabled: true #开启feign连接池
+    max-connections: 100
+    max-connections-per-route: 50
+  client:
+    config:
+      default:
+        connect-timeout: 2000 #默认连接超时时间
+        read-timeout: 8000 #默认请求超时时间
+      payCenterProxy: 
+        connect-timeout: 2000 #代理服务连接超时时间
+        read-timeout: 25000 #代理服务请求超时时
+
+
+xxl:
+  job:
+    admin:
+      addresses: http://192.168.2.92:8089/xxl-job-admin
+    executor:
+      appname: chargeservice
+      address:
+      port: 9999
+      logretentiondays: 30
+    accessToken: default_token
+
+charge:
+  component:
+    uri: http://fee-engine:11005

+ 210 - 0
upgrade_260806/nacos/test/cloudparkauthservice-test.yaml

@@ -0,0 +1,210 @@
+server:
+  port: 10038
+  servlet:
+    encoding:
+      charset: UTF-8
+      force: true
+    context-path: /auth
+  compression:
+    enabled: true #开启数据压缩
+    mime-types: application/json,application/xml,text/html,text/xml,text/plain
+    min-response-size: 2048
+logging:
+  file:
+    path: log/wookit
+  level:
+    root: info
+    "[javax.management]": INFO
+    "[org.apache.http]": INFO
+    "[org.apache.tomcat.util.net.NioEndpoint]": INFO
+    "[sun.rmi]": INFO
+    "[com.alibaba.nacos]": ERROR
+    tracer: trace # 开启trace级别日志,在开发时可以开启此配置,则控制台可以打印es全部请求信息及DSL语句,为了避免重复,开启此项配置后,可以将EE的print-dsl设置为false.
+
+spring:
+  application:
+    name: cloudparkauthservice
+  cloud:
+    gateway:
+      discovery:
+        locator:
+          lower-case-service-id: true
+          enabled: true
+    nacos:
+      discovery:
+        server-addr: 192.168.2.92:8848
+        namespace: 49ab56f7-3752-4c43-a935-a1d4024eb82b    # 开发环境命名空间
+
+  redis:
+    host: 192.168.2.92 #Redis服务器地址
+    database: 3 # Redis数据库索引(默认为0)
+    park-database: 2      # 车场业务库(ParkRedisUtils)
+    card-database: 8      # 月卡业务库(CardRedisUtils)
+    system-database: 1    # 系统业务库(SystemRedisUtils)
+    reduction-database: 6 # 减免业务库(ReductionRedisUtils)
+    charge-database: 4    # 计费业务库(ChargeRedisUtils)
+    device-database: 3    # 设备服务
+    port: 6379 # Redis服务器连接端口
+    password: Fjc@2025 # Redis服务器连接密码(默认为空)
+    prefix: fsv2_test
+    # 以下为跨服务读专用前缀,null/空串表示不附加前缀
+    park-prefix: fsv2_test        # 例如 "fsv2_dev:park:"
+    card-prefix: fsv2_test        # 例如 "fsv2_dev:card:"
+    system-prefix: fsv2_test      # 例如 "fsv2_dev:system:"
+    reduction-prefix:    # 例如 "fsv2_dev:reduction:"
+    charge-prefix:
+    device-prefix: fsv2_test
+    jedis:
+      pool:
+        max-active: 8 # 连接池最大连接数(使用负值表示没有限制)
+        max-wait: -1 # 连接池最大阻塞等待时间(使用负值表示没有限制)
+        max-idle: 8 # 连接池中的最大空闲连接
+        min-idle: 0 # 连接池中的最小空闲连接
+
+  datasource:
+    url: jdbc:mysql://192.168.2.93:3306/test_cloudparkauthservice?useSSL=false&serverTimezone=GMT%2b8
+    username: fujica
+    password: Fjc@2025
+#指定mybatis映射文件的地址
+mybatis:
+  mapper-locations: classpath:mapper/*.xml
+
+
+rocketmq:
+  name-server: 192.168.16.20:9876;192.168.16.21:9876;192.168.16.22:9876
+  producer:
+    group: fujica-producer
+    topic:
+      authResult: park_car_auth_result_test
+      parkauthEvent: parkauth_event_test
+      deviceCommand: parkauth_device_command_test
+      parkInRecordLockStatus: park_in_record_lock_status_test
+      parkEventRecord: park_event_record_test
+      parkFollowRecord: park_follow_record_test
+      parkFollowPayStatus: park_follow_payStatus_test
+      parkGateOperateRecord: park_gate_operate_record_test
+      parkGateOperateResult: park_gate_operate_result_test
+      deviceCommandRetry: device_command_retry_test
+      parkInRecord: park_in_record_test
+      parkOutRecord: park_out_record_test
+
+  consumer:
+    topic:
+      up:
+        deviceRecognitionResult: device_recognition_test
+        gateStatus: control_gate_result_test
+        gpioInput: gpio_input_event_test
+        heartbeat: heartbeat_event_test
+        serialData: serial_data_event_test
+        snapshotResult: snapshot_result_event_test
+      controlGateResult: control_gate_result_test
+      payResultSync: topic_pay_result_sync_parking_test
+      payNotify: pay_notify_test
+      payNotifyBatch: park_pay_result_notify_batch_test
+      merchantWarn: park_merchant_warning_test
+      ownerReduction: park_owner_reduction_test
+      carAuthentication: park_car_authentication_test
+      groundSense: ground_sense_test
+      reply: device-reply-event_test
+      deviceCommandRetry: device_command_retry_test
+      userVirtualPlateSync: userVirtualPlateSync_test
+    group:
+      up:
+        deviceRecognitionResult: auth_device_recognition_test
+        gateStatus: auth_control_gate_result_test
+        gpioInput: auth_gpio_input_event_test
+        heartbeat: auth_heartbeat_event_test
+        serialData: auth_serial_data_event_test
+        snapshotResult: auth_snapshot_result_event_test
+      controlGateResult: auth_control_gate_result_test
+      payResultSync: auth_pay_result_sync_parking_test
+      payNotify: auth_pay_notify_test
+      payNotifyBatch: auth_pay_result_notify_batch_test
+      merchantWarn: auth_merchant_warning_test
+      ownerReduction: auth_owner_reduction_test
+      carAuthentication: auth_car_authentication_test
+      groundSense: auth_ground_sense_test
+      reply: auth_device-reply-event_test
+      deviceCommandRetry: auth_device_command_retry_test
+      userVirtualPlateSync: auth_userVirtualPlateSync_test
+
+feign:
+  httpclient:
+    enabled: true #开启feign连接池
+    max-connections: 100
+    max-connections-per-route: 50
+  client:
+    config:
+      default:  
+        loggerLevel: FULL
+        connect-timeout: 60000 #默认连接超时时间
+        read-timeout: 60000 #默认请求超时时间
+      cardservice: 
+        connect-timeout: 1000 #月卡服务连接超时时间
+        read-timeout: 8000 #月卡服务请求超时时
+      paymentservice: 
+        connect-timeout: 30000 #支付服务连接超时时间
+        read-timeout: 25000 #支付服务请求超时时间
+      chargeservice: 
+        connect-timeout: 10000 #计费服务连接超时时间
+        read-timeout: 8000 #计费服务请求超时时间
+      payCenterProxy: 
+        connect-timeout: 60000 #代理服务连接超时时间
+        read-timeout: 60000 #代理服务请求超时时
+
+async:
+  corePoolSize: 5
+  maxPoolSize: 10
+  queueCapacity: 20
+  namePrefix: async-service-
+
+
+cross-service-cache:
+  local:
+    enabled: false
+    default-ttl-seconds: 30
+    default-max-size: 10000
+    overrides:
+      monthCard:
+        ttl-seconds: 30
+        max-size: 10000
+      blackList:
+        ttl-seconds: 30
+        max-size: 5000
+      whiteList:
+        ttl-seconds: 30
+        max-size: 5000
+      parkDetail:
+        ttl-seconds: 300
+        max-size: 1000
+      parkSetting:
+        ttl-seconds: 300
+        max-size: 1000
+      lane:
+        ttl-seconds: 300
+        max-size: 2000
+      tempChargeRule:
+        ttl-seconds: 600
+        max-size: 1000
+      deviceInfo:
+        ttl-seconds: 300
+        max-size: 2000
+
+
+xxl:
+  job:
+    admin:
+      addresses: http://192.168.2.92:8089/xxl-job-admin
+    executor:
+      appname: cloudparkauthservice
+      address:
+      port: 9999
+      logretentiondays: 30
+    accessToken: default_token
+
+aliyun:
+  oss:
+    endpoint: http://oss-cn-shenzhen.aliyuncs.com
+    keyid: LTAI5tALFygbdLmGw1VsDEVw
+    keysecret: wVJnGaeR8hkxvdnjr2lIzAWlZGVxTG
+    bucketname: fsbase

+ 94 - 0
upgrade_260806/nacos/test/dataservice-test.yaml

@@ -0,0 +1,94 @@
+server:
+  port: 10013
+  servlet:
+    encoding:
+      charset: UTF-8
+      force: true
+    context-path: /data
+  compression:
+    enabled: true #开启数据压缩
+    mime-types: application/json,application/xml,text/html,text/xml,text/plain
+    min-response-size: 2048
+logging:
+  file:
+    path: log/wookit
+  level:
+    root: info
+    "[javax.management]": INFO
+    "[org.apache.http]": INFO
+    "[org.apache.tomcat.util.net.NioEndpoint]": INFO
+    "[sun.rmi]": INFO
+    "[com.alibaba.nacos]": ERROR
+    #"[org.mongodb.driver.protocol.command]": DEBUG
+    tracer: trace # 开启trace级别日志,在开发时可以开启此配置,则控制台可以打印es全部请求信息及DSL语句,为了避免重复,开启此项配置后,可以将EE的print-dsl设置为false.
+
+spring:
+  application:
+    name: dataservice
+  cloud:
+    gateway:
+      discovery:
+        locator:
+          lower-case-service-id: true
+          enabled: true
+    nacos:
+      discovery:
+        server-addr: 192.168.2.92:8848
+        namespace: 49ab56f7-3752-4c43-a935-a1d4024eb82b
+
+  redis:
+    host: 192.168.2.92 #Redis服务器地址
+    database: 10 # Redis数据库索引(默认为0)
+    port: 6379 # Redis服务器连接端口
+    password: Fjc@2025 # Redis服务器连接密码(默认为空)
+    prefix: fsv2_test
+    jedis:
+      pool:
+        max-active: 8 # 连接池最大连接数(使用负值表示没有限制)
+        max-wait: -1 # 连接池最大阻塞等待时间(使用负值表示没有限制)
+        max-idle: 8 # 连接池中的最大空闲连接
+        min-idle: 0 # 连接池中的最小空闲连接
+  data:
+    mongodb:
+      # uri: mongodb://root:FJc123456!%40%23%26@dds-wz92ac81710b54241.mongodb.rds.aliyuncs.com:3717,dds-wz92ac81710b54242.mongodb.rds.aliyuncs.com:3717/fujica_data_center?replicaSet=mgset-77298810&authSource=admin
+      uri: mongodb://admin:Fjc%402025@192.168.2.93:27017/fujica_data_center_test?authSource=admin
+rocketmq:
+  name-server: 192.168.16.20:9876;192.168.16.21:9876;192.168.16.22:9876
+  producer:
+    group: fujica-producer
+  consumer:
+    topic: 
+      topicDcEventAdd: topic_dc_event_add_test
+      topicDcEventBatchAdd: topic_dc_event_batch_add_test
+      topicDcServiceAdd: topic_dc_service_add_test
+      topicDcServiceBatchAdd: topic_dc_service_batch_add_test
+      topicDcServiceBatchDel: topic_dc_service_batch_del_test
+      topicDcServiceBatchUpdate: topic_dc_service_batch_update_test
+      topicDcServiceDel: topic_dc_service_del_test
+      topicDcServiceUpdate: topic_dc_service_update_test
+    group: 
+      topicDcEventAdd: topic_dc_event_add_test
+      topicDcEventBatchAdd: topic_dc_event_batch_add_test
+      topicDcServiceAdd: topic_dc_service_add_test
+      topicDcServiceBatchAdd: topic_dc_service_batch_add_test
+      topicDcServiceBatchDel: topic_dc_service_batch_del_test
+      topicDcServiceBatchUpdate: topic_dc_service_batch_update_test
+      topicDcServiceDel: topic_dc_service_del_test
+      topicDcServiceUpdate: topic_dc_service_update_test
+
+xxl:
+  job:
+    admin:
+      addresses: http://192.168.2.92:8089/xxl-job-admin
+    executor:
+      appname: dataservice
+      address:
+      port: 9999
+      logretentiondays: 30
+    accessToken: default_token
+
+async:
+  corePoolSize: 2
+  maxPoolSize: 8
+  queueCapacity: 1000
+  namePrefix: async-service-

+ 113 - 0
upgrade_260806/nacos/test/devicedriveservice-test.yaml

@@ -0,0 +1,113 @@
+server:
+  port: 10042
+  servlet:
+    encoding:
+      charset: UTF-8
+      force: true
+    context-path: /devicedrive
+  compression:
+    enabled: true
+    mime-types: application/json,application/xml,text/html,text/xml,text/plain
+    min-response-size: 2048
+logging:
+  file:
+    path: log/wookit
+  level:
+    root: info
+    "[javax.management]": INFO
+    "[org.apache.http]": INFO
+    "[org.apache.tomcat.util.net.NioEndpoint]": INFO
+    "[sun.rmi]": INFO
+    "[com.alibaba.nacos]": ERROR
+    tracer: trace # 开启trace级别日志,在开发时可以开启此配置,则控制台可以打印es全部请求信息及DSL语句,为了避免重复,开启此项配置后,可以将EE的print-dsl设置为false.
+
+spring:
+  application:
+    name: devicedriveservice
+  cloud:
+    nacos:
+      discovery:
+        server-addr: 192.168.2.92:8848
+        namespace: 49ab56f7-3752-4c43-a935-a1d4024eb82b
+
+  redis:
+    host: 192.168.2.92
+    database: 1
+    port: 6379
+    password: Fjc@2025
+    prefix: fsv2_test
+    jedis:
+      pool:
+        max-active: 8
+        max-wait: -1
+        max-idle: 8
+        min-idle: 0
+
+mqtt:
+  emqx:
+    endpoint: 192.168.2.92
+    port: 1883
+    username: admin
+    password: fujica0408
+    subclientid: ${spring.application.name}-subscriber-${random.value}
+    pubclientid: ${spring.application.name}-publisher-${random.value}
+    qos: 1
+    keepaliveinterval: 300
+    cleansession: false
+    automaticreconnect: true
+    completiontimeout: 30000
+    reconnectInterval: 10000
+    maxReconnectAttempts: -1
+    connectionTimeout: 30
+    baseReconnectDelay: 1000
+    maxReconnectDelay: 60000
+    topicdeviceup: device/+/message/up/+
+    topicdownack: device/+/message/down/+/reply
+    topicheartbeat: $/device/+/message/up/keep_alive
+  retry:
+    enabled: true
+    maxAttempts: 10
+    initialInterval: 5000
+    maxInterval: 60000
+    multiplier: 2.0
+    connectionTimeout: 30000
+    heartbeatInterval: 30000
+    immediateRetry: true
+    strategy: EXPONENTIAL_BACKOFF
+
+rocketmq:
+  name-server: 192.168.16.20:9876;192.168.16.21:9876;192.168.16.22:9876
+  producer:
+    group: device-drive-producer
+    send-message-timeout: 30000
+    retry-times-when-send-failed: 3
+    topic:
+      up:
+        deviceRecognitionResult: device_recognition_test
+        gateStatus: control_gate_result_test
+        gpioInput: gpio_input_event_test
+        heartbeat: heartbeat_event_test
+        serialData: serial_data_event_test
+        snapshotResult: snapshot_result_event_test
+      reply: device-reply-event_test
+      gpioDeviceStatus: gpio_device_status_test
+  consumer:
+    topic:
+      parkDeviceInfoSync: park-device-info-sync_test
+      deviceCommand: parkauth_device_command_test
+    group:
+      parkDeviceInfoSync: park-device-info-sync-group_test
+      deviceCommand: device-command-consumer-group_test
+
+device:
+  auto-register: true
+  heartbeat-interval: 60
+  offline-timeout: 300
+
+async:
+  thread-pool:
+    common:
+      core-pool-size: 4
+      max-pool-size: 16
+      queue-capacity: 512
+      name-prefix: async-common-

+ 86 - 0
upgrade_260806/nacos/test/deviceservice-test.yaml

@@ -0,0 +1,86 @@
+server:
+  port: 10041
+  servlet:
+    encoding:
+      charset: UTF-8
+      force: true
+    context-path: /device
+  compression:
+    enabled: true #开启数据压缩
+    mime-types: application/json,application/xml,text/html,text/xml,text/plain
+    min-response-size: 2048
+logging:
+  file:
+    path: log/wookit
+  level:
+    root: info
+    "[javax.management]": INFO
+    "[org.apache.http]": INFO
+    "[org.apache.tomcat.util.net.NioEndpoint]": INFO
+    "[sun.rmi]": INFO
+    tracer: trace # 开启trace级别日志,在开发时可以开启此配置,则控制台可以打印es全部请求信息及DSL语句,为了避免重复,开启此项配置后,可以将EE的print-dsl设置为false.
+
+spring:
+  application:
+    name: deviceservice
+  cloud:
+    gateway:
+      discovery:
+        locator:
+          lower-case-service-id: true
+          enabled: true
+    nacos:
+      discovery:
+        server-addr: 192.168.2.92:8848
+        namespace: 49ab56f7-3752-4c43-a935-a1d4024eb82b
+
+  redis:
+    host: 192.168.2.92 #Redis服务器地址
+    database: 3 # Redis数据库索引(默认为0)
+    port: 6379 # Redis服务器连接端口
+    password: Fjc@2025 # Redis服务器连接密码(默认为空)
+    prefix: fsv2_test
+    jedis:
+      pool:
+        max-active: 8 # 连接池最大连接数(使用负值表示没有限制)
+        max-wait: -1 # 连接池最大阻塞等待时间(使用负值表示没有限制)
+        max-idle: 8 # 连接池中的最大空闲连接
+        min-idle: 0 # 连接池中的最小空闲连接
+
+  datasource:
+    url: jdbc:mysql://192.168.2.93:3306/test_deviceservice?useSSL=false&serverTimezone=GMT%2b8
+    username: fujica
+    password: Fjc@2025
+
+#指定mybatis映射文件的地址
+mybatis:
+  mapper-locations: classpath:mapper/*.xml
+  #configuration:
+  #  log-impl: org.apache.ibatis.logging.stdout.StdOutImpl 
+
+rocketmq:
+  name-server: 192.168.16.20:9876;192.168.16.21:9876;192.168.16.22:9876
+  producer:
+    group: fujica-producer
+    topic:
+      topicDeviceInfo: topic_device_info_test
+      topicDeviceOnlineStatus: topic_device_status_test
+  consumer:
+    topic: 
+      topicDeviceOnlineStatus: device_online_status_test
+      heartbeat: heartbeat_event_test
+    group: 
+      topicDeviceOnlineStatus: device_online_status_test
+      heartbeat: device_heartbeat_event_test
+
+feign:
+  httpclient:
+    enabled: true #开启feign连接池
+    max-connections: 100
+    max-connections-per-route: 50
+  client:
+    config:
+      default:  
+        connect-timeout: 2000 #默认连接超时时间
+        read-timeout: 8000 #默认请求超时时间
+

+ 187 - 0
upgrade_260806/nacos/test/inoutservice-test.yaml

@@ -0,0 +1,187 @@
+server:
+  port: 10011
+  servlet:
+    encoding:
+      charset: UTF-8
+      force: true
+    context-path: /inout
+  compression:
+    enabled: true #开启数据压缩
+    mime-types: application/json,application/xml,text/html,text/xml,text/plain
+    min-response-size: 2048
+logging:
+  file:
+    path: log/wookit
+  level:
+    root: info
+    "[javax.management]": INFO
+    "[org.apache.http]": INFO
+    "[org.apache.tomcat.util.net.NioEndpoint]": INFO
+    "[sun.rmi]": INFO
+    "[com.alibaba.nacos]": ERROR
+    tracer: trace # 开启trace级别日志,在开发时可以开启此配置,则控制台可以打印es全部请求信息及DSL语句,为了避免重复,开启此项配置后,可以将EE的print-dsl设置为false.
+
+spring:
+  application:
+    name: inoutservice
+  cloud:
+    gateway:
+      discovery:
+        locator:
+          lower-case-service-id: true
+          enabled: true
+    nacos:
+      discovery:
+        server-addr: 192.168.2.92:8848
+        namespace: 49ab56f7-3752-4c43-a935-a1d4024eb82b
+
+  redis:
+    host: 192.168.2.92 #Redis服务器地址
+    database: 9 # Redis数据库索引(默认为0)
+    port: 6379 # Redis服务器连接端口
+    password: Fjc@2025 # Redis服务器连接密码(默认为空)
+    prefix: fsv2_test
+    jedis:
+      pool:
+        max-active: 8 # 连接池最大连接数(使用负值表示没有限制)
+        max-wait: -1 # 连接池最大阻塞等待时间(使用负值表示没有限制)
+        max-idle: 8 # 连接池中的最大空闲连接
+        min-idle: 0 # 连接池中的最小空闲连接
+  shardingsphere:
+    props:
+      sql-show: false
+    datasource:
+      ds0:
+        username: fujica
+        password: Fjc@2025
+        url: jdbc:mysql://192.168.2.93:3306/test_inoutservice?useSSL=false&serverTimezone=GMT%2b8
+        type: com.zaxxer.hikari.HikariDataSource
+        driver-class-name: com.mysql.cj.jdbc.Driver
+        validation-timeout: 3000
+        idle-timeout: 60000
+        minimum-idle: 30
+        read-only: false
+        connection-timeout: 60000 #请求连接的超时时间
+        maximum-pool-size: 500 #最大连接数量
+        max-lifetime: 1800000 #连接的最长生命周期
+        connection-test-query: select 1 #连接验证sql
+      names: ds0
+    rules:
+      sharding:
+        sharding-algorithms:
+          # 分表算法
+          table-parkin:
+            type: INLINE
+            props:
+              algorithm-expression: io_park_in_$->{Math.abs(project_no.hashCode()%10) +1}
+          table-parkout:
+            type: INLINE
+            props:
+              algorithm-expression: io_park_out_$->{Math.abs(project_no.hashCode()%10) +1}
+
+        tables:
+          io_park_in:
+            actual-data-nodes: ds0.io_park_in_$->{1..10}
+            key-generate-strategy:
+              column: project_no
+              key-generator-name: projectuuid
+            # 分表策略
+            table-strategy:
+              standard:
+                sharding-column: project_no
+                sharding-algorithm-name: table-parkin
+          io_park_out:
+            actual-data-nodes: ds0.io_park_out_$->{1..10}
+            key-generate-strategy:
+              column: project_no
+              key-generator-name: projectuuid
+            # 分表策略
+            table-strategy:
+              standard:
+                sharding-column: project_no
+                sharding-algorithm-name: table-parkout
+        key-generators:
+          projectuuid:
+            type: UUID
+    mode:
+      type: Standalone
+
+
+#指定mybatis映射文件的地址
+mybatis:
+  mapper-locations: classpath:mapper/*.xml
+
+
+rocketmq:
+  name-server: 192.168.16.20:9876;192.168.16.21:9876;192.168.16.22:9876
+  producer:
+    group: fujica-producer
+    topic: 
+      topicDcEventAdd: topic_dc_event_add_test
+      topicDcEventBatchAdd: topic_dc_event_batch_add_test
+      topicDcServiceUpdate: topic_dc_service_update_test
+      topicExPushParkIn: ex_park_in_data_test
+      topicExPushParkInRecord: ex_park_in_record_test
+      topicExPushParkOut: ex_park_out_data_test
+      topicExPushModifyPlate: ex_modify_plate_data_test
+      topicExPushFinishOrder: ex_finish_order_test
+      topicExPushDeleteParkIn: ex_delete_park_in_test
+      topicExPushParkCarFeeOrder: ex_park_car_fee_order_test
+  consumer:
+    topic: 
+      parkInRecord: park_in_record_test
+      parkCarFeeOrder: park_car_fee_order_test
+      parkDeleteInRecords: park_delete_inRecords_test
+      parkEventRecord: park_event_record_test
+      parkFinishOrder: park_finish_order_test
+      parkFollowRecord: park_follow_record_test
+      parkFollowPayStatus: park_follow_payStatus_test
+      parkInRecordBatch: park_in_record_batch_test
+      parkInRecordLockStatus: park_inRecord_lockStatus_test
+      parkInRecordOffLine: park_in_record_offline_test
+      parkModifyPlate: park_modify_plate_test
+      parkOutRecord: park_out_record_test
+      parkOutRecordOffline: park_out_record_offline_test
+      parkSupplementInRecord: park_supplement_in_record_test
+      topicExPushParkIn: push_park_in_data_test
+      topicExPushParkOut: push_park_out_data_test
+      parkModifyInModel: park_modify_in_model_test
+      topicExPushModifyPlate: push_modify_plate_data_test
+      parkGateOperateRecord: park_gate_operate_record_test
+      # 云停车临停支付结果topic(云停车专属)
+      cloudPayResult: cloud_pay_result_test
+    group: 
+      parkInRecord: park_in_record_test
+      parkCarFeeOrder: park_car_fee_order_test
+      parkDeleteInRecords: park_delete_inRecords_test
+      parkEventRecord: park_event_record_test
+      parkFinishOrder: park_finish_order_test
+      parkFollowRecord: park_follow_record_test
+      parkFollowPayStatus: park_follow_payStatus_test
+      parkInRecordBatch: park_in_record_batch_test
+      parkInRecordLockStatus: park_inRecord_lockStatus_test
+      parkInRecordOffLine: park_in_record_offline_test
+      parkModifyPlate: park_modify_plate_test
+      parkOutRecord: park_out_record_test
+      parkOutRecordOffline: park_out_record_offline_test
+      parkSupplementInRecord: park_supplement_in_record_test
+      topicExPushParkIn: push_park_in_data_test
+      topicExPushParkOut: push_park_out_data_test
+      parkModifyInModel: park_modify_in_model_test
+      topicExPushModifyPlate: push_modify_plate_data_test
+      parkGateOperateRecord: park_gate_operate_record_test
+      # 云停车临停支付结果消费组(云停车专属)
+      cloudPayResult: cloud_pay_result_group_test
+
+async:
+  corePoolSize: 20
+  maxPoolSize: 20
+  queueCapacity: 1000
+  namePrefix: async-service-
+
+aliyun:
+  oss:
+    endpoint: http://oss-cn-shenzhen.aliyuncs.com
+    keyid: LTAI5tALFygbdLmGw1VsDEVw
+    keysecret: wVJnGaeR8hkxvdnjr2lIzAWlZGVxTG
+    bucketname: fsbase

+ 179 - 0
upgrade_260806/nacos/test/parkservice-test.yaml

@@ -0,0 +1,179 @@
+server:
+  port: 10002
+  servlet:
+    encoding:
+      charset: UTF-8
+      force: true
+    context-path: /park
+  compression:
+    enabled: true #开启数据压缩
+    mime-types: application/json,application/xml,text/html,text/xml,text/plain
+    min-response-size: 2048
+logging:
+  file:
+    path: log/wookit
+  level:
+    root: info
+    "[javax.management]": INFO
+    "[org.apache.http]": INFO
+    "[org.apache.tomcat.util.net.NioEndpoint]": INFO
+    "[sun.rmi]": INFO
+    "[com.alibaba.nacos]": ERROR
+    tracer: trace # 开启trace级别日志,在开发时可以开启此配置,则控制台可以打印es全部请求信息及DSL语句,为了避免重复,开启此项配置后,可以将EE的print-dsl设置为false.
+
+spring:
+  application:
+    name: parkservice
+  cloud:
+    gateway:
+      discovery:
+        locator:
+          lower-case-service-id: true
+          enabled: true
+    nacos:
+      discovery:
+        # server-addr: 10.0.2.77:8848
+        server-addr: 192.168.2.92:8848
+        namespace: 49ab56f7-3752-4c43-a935-a1d4024eb82b
+
+  redis:
+    host: 192.168.2.92 #Redis服务器地址
+    database: 2 # Redis数据库索引(默认为0)
+    port: 6379 # Redis服务器连接端口
+    password: Fjc@2025 # Redis服务器连接密码(默认为空)
+    prefix: fsv2_test
+    jedis:
+      pool:
+        max-active: 8 # 连接池最大连接数(使用负值表示没有限制)
+        max-wait: -1 # 连接池最大阻塞等待时间(使用负值表示没有限制)
+        max-idle: 8 # 连接池中的最大空闲连接
+        min-idle: 0 # 连接池中的最小空闲连接
+
+  datasource:
+    url: jdbc:mysql://192.168.2.93:3306/test_parkservice?useSSL=false&serverTimezone=GMT%2b8
+    username: fujica
+    password: Fjc@2025
+
+#指定mybatis映射文件的地址
+mybatis:
+  mapper-locations: classpath:mapper/*.xml 
+
+park:
+  qrcode:
+    img-width: 400
+    img-height: 400
+    decode-url: http://gatewayservicev2test.fujica.com.cn/transfer/mobile/qrcode/decode #二维码解码地址
+    err-page-url: http://v2test-fsh5.fujica.com.cn/pages/h5/errorPage #解析到错误二维码跳转地址
+    types:
+      - type: 1
+        url: http://v2test-fsh5.fujica.com.cn/pages/pay/paycost
+        name: 场内码
+      - type: 2
+        url: http://v2test-fsh5.fujica.com.cn/pages/h5/parkIn
+        name: 入口码
+      - type: 3
+        url: http://v2test-fsh5.fujica.com.cn/pages/pay/pay 
+        name: 出口码
+      - type: 4
+        url: http://v2test-fsh5.fujica.com.cn/pages/pay/getCoupon
+        name: 减免领取码(静态)
+      - type: 5
+        url: http://v2test-fsh5.fujica.com.cn/pages/pay/getCoupon
+        name: 减免领取码(动态)
+        save-mode: 2 #存redis
+      - type: 6
+        url: http://v2test-fsh5.fujica.com.cn/pages/h5/assignPlate
+        name: 获取虚拟车牌
+      - type: 7
+        url: http://www.baidu.com
+        name: 缴费机找零
+      - type: 8
+        url: https://v2test-fsh5.fujica.com.cn/map
+        name: 反向寻车
+
+rocketmq:
+  name-server: 192.168.16.20:9876;192.168.16.21:9876;192.168.16.22:9876
+  producer:
+    group: fujica-producer
+    topic:
+      dc: #数据中心主题配置
+        eventAdd: topic_dc_event_add_test
+        eventBatchAdd: topic_dc_event_batch_add_test
+        serviceAdd: topic_dc_service_add_test
+        serviceBatchAdd: topic_dc_service_batch_add_test
+        serviceBatchDelete: topic_dc_service_batch_del_test
+        serviceBatchUpdate: topic_dc_service_batch_update_test
+        serviceDelete: topic_dc_service_del_test
+        serviceUpdate: topic_dc_service_update_test
+      topicParkInfo: topic_park_info_test
+      topicParkPlace: topic_park_place_test
+      topicParkLane: topic_park_lane_test
+      deviceCommand: parkauth_device_command_test
+
+  consumer:
+    topic: 
+      parkResiduePlace: park_residue_place_test
+      reserveRealTime: park_reserve_realtime_test
+      projectOnlineStatus: topic_project_online_status_test
+      controlGateResult: park_gate_operate_result_test
+      upPlaceInoutCar: upplaceinoutcar_sync_test
+      placeReserve: place_reserve_v2_test
+      placeReserveE8Confirm: park_book_e8_confirm_test
+      placeReserveLockResult: park_reserve_lock_result_test
+      payresult: topic_pay_result_sync_reserve_test
+      topicExPushParkIn: ex_park_in_data_test
+      topicExPushParkOut: ex_park_out_data_test
+      parkBookPrepaidFee: park_book_prepaid_fee_test
+      parkBookPrepaidFeeNotice: park_book_prepaid_fee_notice_test
+      parkBookPrepaidFeeRefund: park_book_prepaid_fee_refund_test
+      parkLaneStatus: park_lane_status_test
+      payrefundresult: topic_pay_refund_sync_test
+      temopayresult: topic_pay_result_sync_parking_test
+      topicExPushDeleteParkIn: ex_delete_park_in_test
+    group: 
+      parkResiduePlace: park_residue_place_test
+      reserveRealTime: park_reserve_realtime_test
+      projectOnlineStatus: topic_project_online_status_test
+      controlGateResult: park_gate_operate_result_test
+      upPlaceInoutCar: upplaceinoutcar_sync_test
+      placeReserve: place_reserve_v2_test
+      placeReserveE8Confirm: park_book_e8_confirm_test
+      placeReserveLockResult: park_reserve_lock_result_test
+      payresult: topic_pay_result_sync_reserve_test
+      topicExPushParkIn: ex_park_in_data_park_test
+      topicExPushParkOut: ex_park_out_data_park_test
+      parkBookPrepaidFee: park_book_prepaid_fee_test
+      parkBookPrepaidFeeNotice: park_book_prepaid_fee_notice_test
+      parkBookPrepaidFeeRefund: park_book_prepaid_fee_refund_test
+      parkLaneStatus: park_lane_status_test
+      payrefundresult: topic_pay_refund_sync_test
+      temopayresult: topic_pay_result_sync_park_test
+      topicExPushDeleteParkIn: park_ex_delete_park_in_test
+
+async:
+  thread-pool: #为@Async功能配置的线程池
+    park: #车场通用线程池
+      core-pool-size: 1
+      max-pool-size: 5
+      queue-capacity: 1000
+      name-prefix: park
+
+
+xxl:
+  job:
+    admin:
+      addresses: http://192.168.2.92:8089/xxl-job-admin
+    executor:
+      appname: parkservice
+      address:
+      port: 9999
+      logretentiondays: 30
+    accessToken: default_token
+
+# 外部API配置
+external:
+  api:
+    reservation-base-url: http://192.168.8.124:31130
+    park-info-sync-url: /park/tparklist/addBatch
+    connect-timeout: 5000
+    read-timeout: 10000

+ 150 - 0
upgrade_260806/nacos/test/reductionservice-test.yaml

@@ -0,0 +1,150 @@
+server:
+  port: 10007
+  servlet:
+    encoding:
+      charset: UTF-8
+      force: true
+    context-path: /reduction
+  compression:
+    enabled: true #开启数据压缩
+    mime-types: application/json,application/xml,text/html,text/xml,text/plain
+    min-response-size: 2048
+logging:
+  file:
+    path: log/wookit
+  level:
+    root: info
+    "[javax.management]": INFO
+    "[org.apache.http]": INFO
+    "[org.apache.tomcat.util.net.NioEndpoint]": INFO
+    "[sun.rmi]": INFO
+    "[com.alibaba.nacos]": ERROR
+    tracer: trace # 开启trace级别日志,在开发时可以开启此配置,则控制台可以打印es全部请求信息及DSL语句,为了避免重复,开启此项配置后,可以将EE的print-dsl设置为false.
+
+spring:
+  application:
+    name: reductionservice
+  cloud:
+    gateway:
+      discovery:
+        locator:
+          lower-case-service-id: true
+          enabled: true
+    nacos:
+      discovery:
+        server-addr: 192.168.2.92:8848
+        namespace: 49ab56f7-3752-4c43-a935-a1d4024eb82b
+
+  redis:
+    host: 192.168.2.92 #Redis服务器地址
+    database: 6 # Redis数据库索引(默认为0)
+    port: 6379 # Redis服务器连接端口
+    password: Fjc@2025 # Redis服务器连接密码(默认为空)
+    jedis:
+      pool:
+        max-active: 8 # 连接池最大连接数(使用负值表示没有限制)
+        max-wait: -1 # 连接池最大阻塞等待时间(使用负值表示没有限制)
+        max-idle: 8 # 连接池中的最大空闲连接
+        min-idle: 0 # 连接池中的最小空闲连接
+
+  datasource:
+    url: jdbc:mysql://192.168.2.93:3306/test_reductionservice?useSSL=false&serverTimezone=GMT%2b8
+    username: fujica
+    password: Fjc@2025
+    type: com.zaxxer.hikari.HikariDataSource
+    driver-class-name: com.mysql.cj.jdbc.Driver
+    validation-timeout: 3000
+    idle-timeout: 60000
+    minimum-idle: 30
+    read-only: false
+    connection-timeout: 60000 #请求连接的超时时间
+    maximum-pool-size: 1000 #最大连接数量
+    max-lifetime: 1800000 #连接的最长生命周期
+    connection-test-query: select 1 #连接验证sql
+  
+  jackson:
+    time-zone: GMT+8
+    date-format: yyyy-MM-dd HH:mm:ss
+
+    default-property-inclusion: NON_NULL
+    serialization:
+      WRITE_DATES_AS_TIMESTAMPS: false
+      fail-on-empty-beans: false
+
+
+#指定mybatis映射文件的地址
+mybatis:
+  mapper-locations: classpath*:mapper/*.xml
+  configuration:
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+
+pagehelper:
+  reasonable: false
+  pageSizeZero: false
+  defaultCount: true
+
+async:
+  corePoolSize: 5
+  maxPoolSize: 10
+  queueCapacity: 20
+  namePrefix: async-service-
+
+rocketmq:
+  name-server: 192.168.16.20:9876;192.168.16.21:9876;192.168.16.22:9876
+  producer:
+    group: fujica-producer
+    topic: 
+      topicDcEventAdd: topic_dc_event_add_test
+      topicDcEventUpdate: topic_dc_service_update_test
+      topicDcEventBatchAdd: topic_dc_event_batch_add_test
+      topicPayRefund: topic_pay_refund_create_test
+      voidByCarInId: void_by_car_in_id_test
+
+  consumer:
+    topic: 
+      parkCarAuthResult: park_car_auth_result_test
+      payResult: topic_pay_result_sync_merchant_test
+      topicExPushParkIn: ex_park_in_data_test   
+      topicExPushParkOut: ex_park_out_data_test
+      parkPromotionRecordResult: park_promotion_record_result_test
+      voidByCarInId: void_by_car_in_id_test
+    group: 
+      parkCarAuthResult: park_car_auth_result_test
+      payResult: pay_result_sync_merchant_test
+      topicExPushParkIn: rd_ex_park_in_data_test
+      topicExPushParkOut: rd_ex_park_out_data_test
+      parkPromotionRecordResult: park_promotion_record_result_test
+      voidByCarInId: void_by_car_in_id_test  
+
+qrcode:
+ pageurl: http://v2test-fspark.fujica.com.cn/#/qrCode
+
+ #特来电
+telaidian:
+  operatorID: 395815801
+  operatorSecret: 1234567890abcdef
+  sigSecret: 1234567890abcdef
+  dataSecret: 1234567890abcdef
+  dataSecretIV: 1234567890abcdef
+  operatorIDForPark: 0MA5FPQLY
+  mainUrl: http://hlht.teld9.xyz/evcs/v20191230
+  accessToken: kVnStIRknCCOBdXgJrmu8rb3pcccifKW2NcQrysKKIzb7iQBxkkjeq3WoGdjgrIL
+  
+
+#小桔充电
+xiaoju:
+  signKey: 6d505fb04c0d495c8712fa4d5c972434
+  appKey: ig/vFInn02swHPMZccuf1QyH6iWm8sZZkMwXqelnEFQ=
+  appSecret: tKLXRx9h9i4jpMHGgbQYVtFl34QSkt8I3Gf7RDpUDEw=
+  apiUrl: https://gw.am.xiaojukeji.com/parking/gateway/standardModel/pushWaiverResult
+
+xxl:
+  job:
+    admin:
+      addresses: http://192.168.2.92:8089/xxl-job-admin
+    executor:
+      appname: reductionservice
+      address:
+      port: 9999
+      logretentiondays: 30
+    accessToken: default_token

+ 169 - 0
upgrade_260806/nacos/test/systemservice-test.yaml

@@ -0,0 +1,169 @@
+server:
+  port: 10010
+  servlet:
+    encoding:
+      charset: UTF-8
+      force: true
+    context-path: /sys
+  compression:
+    enabled: true #开启数据压缩
+    mime-types: application/json,application/xml,text/html,text/xml,text/plain
+    min-response-size: 2048
+logging:
+  file:
+    path: log/wookit
+  level:
+    root: info
+    "[javax.management]": INFO
+    "[org.apache.http]": INFO
+    "[org.apache.tomcat.util.net.NioEndpoint]": INFO
+    "[sun.rmi]": INFO
+    "[com.alibaba.nacos]": ERROR
+    tracer: trace # 开启trace级别日志,在开发时可以开启此配置,则控制台可以打印es全部请求信息及DSL语句,为了避免重复,开启此项配置后,可以将EE的print-dsl设置为false.
+
+spring:
+  application:
+    name: systemservice
+  cloud:
+    gateway:
+      discovery:
+        locator:
+          lower-case-service-id: true
+          enabled: true
+    nacos:
+      discovery:
+        server-addr: 192.168.2.92:8848
+        namespace: 49ab56f7-3752-4c43-a935-a1d4024eb82b
+
+  redis:
+    host: 192.168.2.92 #Redis服务器地址
+    database: 1 # Redis数据库索引(默认为0)
+    port: 6379 # Redis服务器连接端口
+    password: Fjc@2025 # Redis服务器连接密码(默认为空)
+    prefix: fsv2_test
+    jedis:
+      pool:
+        max-active: 8 # 连接池最大连接数(使用负值表示没有限制)
+        max-wait: -1 # 连接池最大阻塞等待时间(使用负值表示没有限制)
+        max-idle: 8 # 连接池中的最大空闲连接
+        min-idle: 0 # 连接池中的最小空闲连接
+
+  datasource:
+    #    url: jdbc:mysql://119.23.214.109:30336/31.fsboxcloud?useSSL=false
+    url: jdbc:mysql://192.168.2.93:3306/test_systemservice?useSSL=false&serverTimezone=GMT%2b8
+    username: fujica
+    password: Fjc@2025
+
+  # data:
+  #   mongodb:
+  #     uri: mongodb://root:FJc123456!%40%23%26@dds-wz92ac81710b54241.mongodb.rds.aliyuncs.com:3717,dds-wz92ac81710b54242.mongodb.rds.aliyuncs.com:3717/fujica_data_center?replicaSet=mgset-77298810&authSource=admin
+
+jwt:
+  access-token-expire: 3600000
+  access-token-secret: 123456
+  refresh-token-expire: 3600000
+  refresh-token-secret: 123456
+  app-access-token-expire: 2592000 #爱泊客小程序、H5登录有效期(30天)
+
+mybatis:
+  mapper-locations: classpath:/mapper/*.xml
+  configuration:
+    map-underscore-to-camel-case: true
+  type-handlers-package:
+    com.fujica.util
+# 阿里云OSS
+# 不同服务器地址不同
+aliyun:
+  oss:
+    file:
+      endpoint: https://oss-cn-shenzhen.aliyuncs.com
+      keyid: LTAI5tALFygbdLmGw1VsDEVw
+      keysecret: wVJnGaeR8hkxvdnjr2lIzAWlZGVxTG
+      bucketname: fsbase
+
+feign:
+  httpclient:
+    enabled: true #开启feign连接池
+    max-connections: 100
+    max-connections-per-route: 50
+  client:
+    config:
+      default:
+        connect-timeout: 2000 #默认连接超时时间
+        read-timeout: 2000 #默认请求超时时间
+
+fujica:
+  sha256:
+    salt: fujica2024v2
+  rsa:
+    publicKey: MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMkyd3UWDgDyk70PlCrQJimVswNV8zk8d5DvVpvjtCW3xVuXOACHDQDUsFgHYh/B8A43eADR6+2b/776Bz/ZhjUCAwEAAQ==
+    privateKey: MIIBVQIBADANBgkqhkiG9w0BAQEFAASCAT8wggE7AgEAAkEAyTJ3dRYOAPKTvQ+UKtAmKZWzA1XzOTx3kO9Wm+O0JbfFW5c4AIcNANSwWAdiH8HwDjd4ANHr7Zv/vvoHP9mGNQIDAQABAkAFONca5eClK6akAJSC6/YhnC4SRxfSA3zC+UNRNn7Ff8y/3fzhPjzQa9Fg+5kM9gEQylRDTBfFeBpArr5xk9udAiEA9uoWCJFJQYWDE7Xqv9bQszGuSf/ezuKCRa73H1E/1H8CIQDQmbpDRAfBwCcM759pw3DbhOK4EXN6uFg53n9ZqVM7SwIhAPPFspEs11VP+lQ4c5aJAC0abId0jcZVjOY9Uo/hyJIDAiEAs1fHvTdLF/f1WvjVbJ/ccs8wASL3zsWZDL/Pa63ZYjsCIF9qoBzAEka+ZbRoxvcI9pLx7GFFCvkbOrDlvC+vZO3s
+  login:
+    h5:
+      allowChangeMobileCount: 3 #每天允许变更一次手机号
+      sms:
+        code: SMS_468400780
+        length: 4
+        expireTime: 60
+    common:
+      needVerifyCode: false
+  password:
+    sms:
+      code: SMS_468630113
+  oss:
+    baseUrl: http://192.168.12.131:8080/sys/file/redirect?ossKey=
+rocketmq:
+  name-server: 192.168.16.20:9876;192.168.16.21:9876;192.168.16.22:9876
+  producer:
+    group: fujica-producer
+    topic:
+      topicDcEventAdd: topic_dc_event_add_test
+      topicDcEventBatchAdd: topic_dc_event_batch_add_test
+      topicSysCustomerSync: topic_sys_customer_sync_test
+      topicProjectOnlineStatus: topic_project_online_status_test
+      orgSync: sys_org_sync_test
+      delOrgSync: sys_del_org_sync_test
+      customerSync: sys_customer_sync_test
+      delCustomerSync: sys_del_customer_sync_test
+      areSync: sys_area_sync_test
+      delAreaSync: sys_del_area_sync_test
+      topicProjectInfo: topic_project_info_test
+      topicUserVirtualPlateSync: userVirtualPlateSync_test
+  consumer:
+    topic:
+      sysAreaBatchDelete: sys_area_batch_delete_test
+      sysAreaBatch: sys_area_batch_test
+      sysCustomerBatchDelete: sys_customer_batch_delete_test
+      sysCustomerBatch: sys_customer_batch_test
+      sysOrgBatchDelete: sys_org_batch_delete_test
+      sysOrgBatch: sys_org_batch_test
+      mqttOnlineStatus: mqtt_push_data_test
+      bindMemberOpenId: topic_bind_member_openid_test
+      statReplace: stat_replace_test
+      statMerge: stat_merge_test
+      externalCallback: vms_external_callback_test
+      sysCardCompanyParkRelation: sys_card_company_park_relation_test
+    group:
+      sysAreaBatchDelete: sys_area_batch_delete_test
+      sysAreaBatch: sys_area_batch_test
+      sysCustomerBatchDelete: sys_customer_batch_delete_test
+      sysCustomerBatch: sys_customer_batch_test
+      sysOrgBatchDelete: sys_org_batch_delete_test
+      sysOrgBatch: sys_org_batch_test
+      mqttOnlineStatus: mqtt_online_status_test
+      bindMemberOpenId: topic_bind_member_openid_test
+      statReplace: stat_replace_test
+      statMerge: stat_merge_test
+      externalCallback: vms_external_callback_test
+      sysCardCompanyParkRelation: sys_card_company_park_relation_test
+async:
+  thread-pool: #为@Async功能配置的线程池
+    sys: #系统服务通用线程池
+      core-pool-size: 2
+      max-pool-size: 10
+      queue-capacity: 1000
+      name-prefix: sys
+
+member:
+  plate:
+    limit: 10 #会员最多允许添加车辆数

+ 135 - 0
upgrade_260806/nacos/test/transferservice-test.yaml

@@ -0,0 +1,135 @@
+server:
+  port: 10004
+  servlet:
+    encoding:
+      charset: UTF-8
+      force: true
+    #context-path: /transfer
+  compression:
+    enabled: true #开启数据压缩
+    mime-types: application/json,application/xml,text/html,text/xml,text/plain
+    min-response-size: 2048
+logging:
+  file:
+    path: log/wookit
+  level:
+    root: info
+    "[javax.management]": INFO
+    "[org.apache.http]": INFO
+    "[org.apache.tomcat.util.net.NioEndpoint]": INFO
+    "[sun.rmi]": INFO
+    "[com.alibaba.nacos]": ERROR
+    com.fujica: INFO
+    tracer: trace # 开启trace级别日志,在开发时可以开启此配置,则控制台可以打印es全部请求信息及DSL语句,为了避免重复,开启此项配置后,可以将EE的print-dsl设置为false.
+  enable-print-get-method-resp-data: false #是否打印Get请求响应数据
+
+spring:
+  application:
+    name: transferservice
+  cloud:
+    gateway:
+      discovery:
+        locator:
+          lower-case-service-id: true
+          enabled: true
+    nacos:
+      discovery:
+        server-addr: 192.168.2.92:8848
+        namespace: 49ab56f7-3752-4c43-a935-a1d4024eb82b
+    sentinel:
+      transport:
+        # 添加sentinel的控制台地址
+        dashboard: 192.168.2.92:8787
+        # 指定应用与Sentinel控制台交互的端口,应用会起一个HttpServer占用该端口
+        #port: 8719
+      # 将其配置为 false 即可根据不同的 URL 进行链路限流
+      #web-context-unify: false
+      # 从nacos配置中心拉取规则信息
+      datasource:
+        flow-rules: #流控规则
+          nacos:
+            server-addr: 192.168.2.92:8848
+            namespace: 49ab56f7-3752-4c43-a935-a1d4024eb82b
+            username: nacos
+            password: nacos
+            dataId: ${spring.application.name}-flow-rules
+            groupId: DEFAULT_GROUP   # 注意groupId对应Sentinel Dashboard中的定义
+            data-type: json
+            rule-type: flow
+
+  redis:
+    host: 192.168.2.92 #Redis服务器地址
+    database: 3 # Redis数据库索引(默认为0)
+    port: 6379 # Redis服务器连接端口
+    password: Fjc@2025 # Redis服务器连接密码(默认为空)
+    jedis:
+      pool:
+        max-active: 8 # 连接池最大连接数(使用负值表示没有限制)
+        max-wait: -1 # 连接池最大阻塞等待时间(使用负值表示没有限制)
+        max-idle: 8 # 连接池中的最大空闲连接
+        min-idle: 0 # 连接池中的最小空闲连接
+
+feign:
+  httpclient:
+    enabled: true #开启feign连接池
+    max-connections: 100
+    max-connections-per-route: 50
+  client:
+    config:
+      default:  
+        loggerLevel: FULL
+        connect-timeout: 60000 #默认连接超时时间
+        read-timeout: 60000 #默认请求超时时间
+      cardservice: 
+        connect-timeout: 1000 #月卡服务连接超时时间
+        read-timeout: 8000 #月卡服务请求超时时
+      paymentservice: 
+        connect-timeout: 30000 #支付服务连接超时时间
+        read-timeout: 25000 #支付服务请求超时时间
+      chargeservice: 
+        connect-timeout: 10000 #计费服务连接超时时间
+        read-timeout: 8000 #计费服务请求超时时间
+      payCenterProxy: 
+        connect-timeout: 60000 #代理服务连接超时时间
+        read-timeout: 60000 #代理服务请求超时时
+      dataservice: 
+        connect-timeout: 2000 #代理服务连接超时时间
+        read-timeout: 20000 #代理服务请求超时时
+      
+
+aliyun:
+  oss:
+    endpoint: https://oss-cn-shenzhen.aliyuncs.com
+    keyid: LTAI5tALFygbdLmGw1VsDEVw
+    keysecret: wVJnGaeR8hkxvdnjr2lIzAWlZGVxTG
+    bucketname: fsbase
+
+fujica:
+  sha256:
+    salt: fujica2024v2
+  rsa:
+    publicKey: MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMkyd3UWDgDyk70PlCrQJimVswNV8zk8d5DvVpvjtCW3xVuXOACHDQDUsFgHYh/B8A43eADR6+2b/776Bz/ZhjUCAwEAAQ==
+    privateKey: MIIBVQIBADANBgkqhkiG9w0BAQEFAASCAT8wggE7AgEAAkEAyTJ3dRYOAPKTvQ+UKtAmKZWzA1XzOTx3kO9Wm+O0JbfFW5c4AIcNANSwWAdiH8HwDjd4ANHr7Zv/vvoHP9mGNQIDAQABAkAFONca5eClK6akAJSC6/YhnC4SRxfSA3zC+UNRNn7Ff8y/3fzhPjzQa9Fg+5kM9gEQylRDTBfFeBpArr5xk9udAiEA9uoWCJFJQYWDE7Xqv9bQszGuSf/ezuKCRa73H1E/1H8CIQDQmbpDRAfBwCcM759pw3DbhOK4EXN6uFg53n9ZqVM7SwIhAPPFspEs11VP+lQ4c5aJAC0abId0jcZVjOY9Uo/hyJIDAiEAs1fHvTdLF/f1WvjVbJ/ccs8wASL3zsWZDL/Pa63ZYjsCIF9qoBzAEka+ZbRoxvcI9pLx7GFFCvkbOrDlvC+vZO3s
+
+xss:
+  enabled: true
+  exclude:
+    - /callback/wx/**
+
+async:
+  thread-pool: #为@Async功能配置的线程池
+    common: #通用线程池
+      core-pool-size: 1
+      max-pool-size: 5
+      queue-capacity: 1000
+      name-prefix: transfer
+
+
+# 地址参数
+domain:
+  v2:
+    orderDetailUrl: https://v2test-fsh5.fujica.com.cn/pages/pay/pay #缴费详情页URL
+    invoiceUrl: https://v2test-fsh5.fujica.com.cn/pages/common/carSearch?to=/pages/mine/order/index&token=B61FCADD07E7479EAA91B0167FED0048
+  e7:
+    orderDetailUrl: http://mops-test.fujica.com.cn/v3/login/index?key=FUJICA97
+    invoiceUrl: http://mops-test.fujica.com.cn/v3/login/index?key=FUJICA97&redictType=18