Merge remote-tracking branch 'origin/wd'

# Conflicts:
#	.idea/compiler.xml
#	.idea/encodings.xml
#	.idea/jarRepositories.xml
#	boot-auth/src/main/resources/bootstrap.yml
#	boot-auth/target/classes/bootstrap.yml
#	boot-auth/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
#	boot-common/boot-common-core/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
#	boot-common/boot-common-datascope/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
#	boot-common/boot-common-datasource/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
#	boot-common/boot-common-log/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
#	boot-common/boot-common-redis/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
#	boot-common/boot-common-security/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
#	boot-common/boot-common-swagger/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
#	boot-gateway/src/main/resources/bootstrap.yml
#	boot-gateway/target/classes/bootstrap.yml
#	boot-gateway/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
#	boot-modules/boot-file/boot-file-common/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
#	boot-modules/boot-file/boot-file-remote/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
#	boot-modules/boot-file/boot-file-server/src/main/resources/bootstrap.yml
#	boot-modules/boot-file/boot-file-server/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
#	boot-modules/boot-gen/src/main/resources/bootstrap.yml
#	boot-modules/boot-gen/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
#	boot-modules/boot-job/src/main/resources/bootstrap.yml
#	boot-modules/boot-job/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
#	boot-modules/boot-system/boot-system-common/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
#	boot-modules/boot-system/boot-system-remote/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
#	boot-modules/boot-system/boot-system-server/src/main/resources/bootstrap.yml
#	boot-modules/boot-system/boot-system-server/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
#	boot-valuation-rule/boot-valuation-rule-server/src/main/resources/bootstrap.yml
#	boot-valuation-rule/boot-valuation-rule-server/target/classes/bootstrap.yml
#	boot-valuation/boot-valuation-server/src/main/resources/bootstrap.yml
#	boot-valuation/boot-valuation-server/target/classes/bootstrap.yml
#	boot-visual/boot-monitor/src/main/resources/bootstrap.yml
#	boot-visual/boot-monitor/target/classes/bootstrap.yml
#	boot-visual/boot-monitor/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
#	logs/boot-auth/info.log
#	logs/boot-file/info.log
#	logs/boot-gateway/error.log
#	logs/boot-gateway/info.log
#	logs/boot-gen/info.log
#	logs/boot-job/info.log
#	logs/boot-system/info.log
#	logs/boot-visual-monitor/info.log

.idea/compiler.xml

@@ -2,29 +2,33 @@
 <project version="4">
   <component name="CompilerConfiguration">
     <annotationProcessing>
+      <profile default="true" name="Default" enabled="true" />
       <profile name="Maven default annotation processors profile" enabled="true">
         <sourceOutputDir name="target/generated-sources/annotations" />
         <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
         <outputRelativeToContentRoot value="true" />
         <module name="boot-common-seata" />
         <module name="boot-visual-monitor" />
+        <module name="car-charging-common" />
         <module name="boot-job" />
+        <module name="car-pay-server" />
         <module name="boot-common-redis" />
-        <module name="boot-valuation-server" />
-        <module name="boot-valuation-rule-common" />
+        <module name="rush-order-common" />
         <module name="boot-common-datasource" />
         <module name="boot-gen" />
         <module name="boot-common-core" />
         <module name="boot-common-swagger" />
         <module name="boot-system-server" />
+        <module name="car-pay-remote" />
         <module name="boot-auth" />
-        <module name="boot-valuation-rule-remote" />
-        <module name="boot-valuation-rule-server" />
+        <module name="car-charging-server" />
+        <module name="rush-order-remote" />
+        <module name="car-charging-remote" />
+        <module name="rush-order-server" />
+        <module name="car-pay-common" />
         <module name="boot-file-common" />
         <module name="boot-file-remote" />
         <module name="boot-system-remote" />
-        <module name="boot-valuation-remote" />
-        <module name="boot-valuation-common" />
         <module name="boot-common-log" />
         <module name="boot-common-datascope" />
         <module name="boot-common-security" />
@@ -33,5 +37,11 @@
         <module name="boot-gateway" />
       </profile>
     </annotationProcessing>
+    <bytecodeTargetLevel>
+      <module name="boot-mq" target="1.8" />
+      <module name="boot-system (1)" target="1.8" />
+      <module name="boot-system (2)" target="1.8" />
+      <module name="car_server" target="1.8" />
+    </bytecodeTargetLevel>
   </component>
 </project>

.idea/encodings.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="Encoding">
+  <component name="Encoding" defaultCharsetForPropertiesFiles="UTF-8">
     <file url="file://$PROJECT_DIR$/boot-auth/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/boot-auth/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/boot-common/boot-common-core/src/main/java" charset="UTF-8" />
@@ -45,27 +45,38 @@
     <file url="file://$PROJECT_DIR$/boot-modules/boot-system/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/boot-modules/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/boot-modules/src/main/resources" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/boot-valuation-rule/boot-valuation-rule-common/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/boot-valuation-rule/boot-valuation-rule-common/src/main/resources" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/boot-valuation-rule/boot-valuation-rule-remote/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/boot-valuation-rule/boot-valuation-rule-remote/src/main/resources" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/boot-valuation-rule/boot-valuation-rule-server/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/boot-valuation-rule/boot-valuation-rule-server/src/main/resources" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/boot-valuation-rule/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/boot-valuation-rule/src/main/resources" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/boot-valuation/boot-valuation-common/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/boot-valuation/boot-valuation-common/src/main/resources" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/boot-valuation/boot-valuation-remote/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/boot-valuation/boot-valuation-remote/src/main/resources" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/boot-valuation/boot-valuation-server/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/boot-valuation/boot-valuation-server/src/main/resources" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/boot-valuation/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/boot-valuation/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/boot-mq/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/boot-mq/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/boot-visual/boot-monitor/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/boot-visual/boot-monitor/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/boot-visual/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/boot-visual/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/car-charging/car-charging-common/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/car-charging/car-charging-common/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/car-charging/car-charging-remote/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/car-charging/car-charging-remote/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/car-charging/car-charging-server/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/car-charging/car-charging-server/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/car-charging/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/car-charging/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/car-pay/car-pay-common/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/car-pay/car-pay-common/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/car-pay/car-pay-remote/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/car-pay/car-pay-remote/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/car-pay/car-pay-server/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/car-pay/car-pay-server/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/car-pay/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/car-pay/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/rush-order/rush-order-common/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/rush-order/rush-order-common/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/rush-order/rush-order-remote/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/rush-order/rush-order-remote/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/rush-order/rush-order-server/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/rush-order/rush-order-server/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/rush-order/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/rush-order/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/src/main/resources" charset="UTF-8" />
+    <file url="PROJECT" charset="UTF-8" />
   </component>
 </project>

.idea/jarRepositories.xml

@@ -11,6 +11,11 @@
       <option name="name" value="Central Repository" />
       <option name="url" value="https://repo.maven.apache.org/maven2" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Central Repository" />
+      <option name="url" value="http://maven.aliyun.com/nexus/content/groups/public/" />
+    </remote-repository>
     <remote-repository>
       <option name="id" value="central" />
       <option name="name" value="Maven Central repository" />

.idea/uiDesigner.xml

@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Palette2">
+    <group name="Swing">
+      <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.svg" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
+      </item>
+      <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.svg" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
+      </item>
+      <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.svg" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.svg" removable="false" auto-create-binding="false" can-attach-label="true">
+        <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
+        <initial-values>
+          <property name="text" value="Button" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="RadioButton" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="CheckBox" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.svg" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="Label" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.svg" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.svg" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.svg" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.svg" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.svg" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.svg" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.svg" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
+          <preferred-size width="200" height="200" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.svg" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
+          <preferred-size width="200" height="200" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.svg" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.svg" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
+      </item>
+      <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.svg" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
+          <preferred-size width="-1" height="20" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.svg" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
+      </item>
+      <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
+      </item>
+    </group>
+  </component>
+</project>

.idea/vcs.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+    <mapping directory="" vcs="Git" />
   </component>
 </project>

boot-auth/src/main/resources/bootstrap.yml

@@ -15,7 +15,7 @@ spring:
       discovery:
         # 服务注册地址
         server-addr: 122.152.215.207:8848
-        namespace: 305eac8a-d1bd-4c64-8945-ad0c19c359c5
+        namespace: wdwdwd
       config:
         # 配置中心地址
         server-addr: 122.152.215.207:8848
@@ -24,4 +24,4 @@ spring:
         # 共享配置
         shared-configs:
           - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
-        namespace: 305eac8a-d1bd-4c64-8945-ad0c19c359c5
+        namespace: wdwdwd

boot-auth/target/classes/bootstrap.yml

@@ -15,7 +15,7 @@ spring:
       discovery:
         # 服务注册地址
         server-addr: 122.152.215.207:8848
-        namespace: 305eac8a-d1bd-4c64-8945-ad0c19c359c5
+        namespace: wdwdwd
       config:
         # 配置中心地址
         server-addr: 122.152.215.207:8848
@@ -24,4 +24,4 @@ spring:
         # 共享配置
         shared-configs:
           - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
-        namespace: 305eac8a-d1bd-4c64-8945-ad0c19c359c5
+        namespace: wdwdwd

boot-auth/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -0,0 +1,7 @@
+D:\java\online car-hailing\car_server\boot-auth\src\main\java\com\boot\auth\BootAuthApplication.java
+D:\java\online car-hailing\car_server\boot-auth\src\main\java\com\boot\auth\controller\TokenController.java
+D:\java\online car-hailing\car_server\boot-auth\src\main\java\com\boot\auth\service\SysLoginService.java
+D:\java\online car-hailing\car_server\boot-auth\src\main\java\com\boot\auth\form\RegisterBody.java
+D:\java\online car-hailing\car_server\boot-auth\src\main\java\com\boot\auth\form\LoginBody.java
+D:\java\online car-hailing\car_server\boot-auth\src\main\java\com\boot\auth\service\SysPasswordService.java
+D:\java\online car-hailing\car_server\boot-auth\src\main\java\com\boot\auth\service\SysRecordLogService.java

boot-common/boot-common-core/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -0,0 +1,70 @@
+D:\java\online car-hailing\car_server\boot-common\boot-common-core\src\main\java\com\boot\common\core\utils\StringUtils.java
+D:\java\online car-hailing\car_server\boot-common\boot-common-core\src\main\java\com\boot\common\core\utils\uuid\UUID.java
+D:\java\online car-hailing\car_server\boot-common\boot-common-core\src\main\java\com\boot\common\core\exception\auth\NotPermissionException.java
+D:\java\online car-hailing\car_server\boot-common\boot-common-core\src\main\java\com\boot\common\core\utils\bean\BeanValidators.java
+D:\java\online car-hailing\car_server\boot-common\boot-common-core\src\main\java\com\boot\common\core\utils\sql\SqlUtil.java
+D:\java\online car-hailing\car_server\boot-common\boot-common-core\src\main\java\com\boot\common\core\exception\job\TaskException.java
+D:\java\online car-hailing\car_server\boot-common\boot-common-core\src\main\java\com\boot\common\core\annotation\Excels.java
+D:\java\online car-hailing\car_server\boot-common\boot-common-core\src\main\java\com\boot\common\core\exception\UtilException.java
+D:\java\online car-hailing\car_server\boot-common\boot-common-core\src\main\java\com\boot\common\core\text\Convert.java
+D:\java\online car-hailing\car_server\boot-common\boot-common-core\src\main\java\com\boot\common\core\web\controller\BaseController.java
+D:\java\online car-hailing\car_server\boot-common\boot-common-core\src\main\java\com\boot\common\core\utils\ip\IpUtils.java
+D:\java\online car-hailing\car_server\boot-common\boot-common-core\src\main\java\com\boot\common\core\exception\file\InvalidExtensionException.java
+D:\java\online car-hailing\car_server\boot-common\boot-common-core\src\main\java\com\boot\common\core\exception\user\UserException.java
+D:\java\online car-hailing\car_server\boot-common\boot-common-core\src\main\java\com\boot\common\core\exception\CheckedException.java
+D:\java\online car-hailing\car_server\boot-common\boot-common-core\src\main\java\com\boot\common\core\constant\ServiceNameConstants.java
+D:\java\online car-hailing\car_server\boot-common\boot-common-core\src\main\java\com\boot\common\core\exception\CaptchaException.java
+D:\java\online car-hailing\car_server\boot-common\boot-common-core\src\main\java\com\boot\common\core\utils\file\MimeTypeUtils.java
+D:\java\online car-hailing\car_server\boot-common\boot-common-core\src\main\java\com\boot\common\core\constant\SecurityConstants.java
+D:\java\online car-hailing\car_server\boot-common\boot-common-core\src\main\java\com\boot\common\core\constant\UserConstants.java
+D:\java\online car-hailing\car_server\boot-common\boot-common-core\src\main\java\com\boot\common\core\exception\file\FileSizeLimitExceededException.java
+D:\java\online car-hailing\car_server\boot-common\boot-common-core\src\main\java\com\boot\common\core\exception\user\CaptchaExpireException.java
+D:\java\online car-hailing\car_server\boot-common\boot-common-core\src\main\java\com\boot\common\core\utils\PageUtils.java
+D:\java\online car-hailing\car_server\boot-common\boot-common-core\src\main\java\com\boot\common\core\utils\sign\Base64.java
+D:\java\online car-hailing\car_server\boot-common\boot-common-core\src\main\java\com\boot\common\core\utils\DateUtils.java
+D:\java\online car-hailing\car_server\boot-common\boot-common-core\src\main\java\com\boot\common\core\exception\user\UserPasswordNotMatchException.java
+D:\java\online car-hailing\car_server\boot-common\boot-common-core\src\main\java\com\boot\common\core\enums\UserStatus.java
+D:\java\online car-hailing\car_server\boot-common\boot-common-core\src\main\java\com\boot\common\core\exception\PreAuthorizeException.java
+D:\java\online car-hailing\car_server\boot-common\boot-common-core\src\main\java\com\boot\common\core\xss\XssValidator.java
+D:\java\online car-hailing\car_server\boot-common\boot-common-core\src\main\java\com\boot\common\core\utils\SpringUtils.java
+D:\java\online car-hailing\car_server\boot-common\boot-common-core\src\main\java\com\boot\common\core\utils\bean\BeanUtils.java
+D:\java\online car-hailing\car_server\boot-common\boot-common-core\src\main\java\com\boot\common\core\utils\poi\ExcelUtil.java
+D:\java\online car-hailing\car_server\boot-common\boot-common-core\src\main\java\com\boot\common\core\exception\file\FileException.java
+D:\java\online car-hailing\car_server\boot-common\boot-common-core\src\main\java\com\boot\common\core\exception\InnerAuthException.java
+D:\java\online car-hailing\car_server\boot-common\boot-common-core\src\main\java\com\boot\common\core\utils\poi\ExcelHandlerAdapter.java
+D:\java\online car-hailing\car_server\boot-common\boot-common-core\src\main\java\com\boot\common\core\exception\ServiceException.java
+D:\java\online car-hailing\car_server\boot-common\boot-common-core\src\main\java\com\boot\common\core\context\SecurityContextHolder.java
+D:\java\online car-hailing\car_server\boot-common\boot-common-core\src\main\java\com\boot\common\core\utils\uuid\Seq.java
+D:\java\online car-hailing\car_server\boot-common\boot-common-core\src\main\java\com\boot\common\core\constant\TokenConstants.java
+D:\java\online car-hailing\car_server\boot-common\boot-common-core\src\main\java\com\boot\common\core\exception\auth\NotRoleException.java
+D:\java\online car-hailing\car_server\boot-common\boot-common-core\src\main\java\com\boot\common\core\web\domain\TreeEntity.java
+D:\java\online car-hailing\car_server\boot-common\boot-common-core\src\main\java\com\boot\common\core\domain\Result.java
+D:\java\online car-hailing\car_server\boot-common\boot-common-core\src\main\java\com\boot\common\core\xss\Xss.java
+D:\java\online car-hailing\car_server\boot-common\boot-common-core\src\main\java\com\boot\common\core\utils\html\EscapeUtil.java
+D:\java\online car-hailing\car_server\boot-common\boot-common-core\src\main\java\com\boot\common\core\exception\file\FileUploadException.java
+D:\java\online car-hailing\car_server\boot-common\boot-common-core\src\main\java\com\boot\common\core\utils\uuid\IdUtils.java
+D:\java\online car-hailing\car_server\boot-common\boot-common-core\src\main\java\com\boot\common\core\web\domain\BaseEntity.java
+D:\java\online car-hailing\car_server\boot-common\boot-common-core\src\main\java\com\boot\common\core\utils\file\ImageUtils.java
+D:\java\online car-hailing\car_server\boot-common\boot-common-core\src\main\java\com\boot\common\core\utils\html\HTMLFilter.java
+D:\java\online car-hailing\car_server\boot-common\boot-common-core\src\main\java\com\boot\common\core\web\page\TableDataInfo.java
+D:\java\online car-hailing\car_server\boot-common\boot-common-core\src\main\java\com\boot\common\core\constant\CacheConstants.java
+D:\java\online car-hailing\car_server\boot-common\boot-common-core\src\main\java\com\boot\common\core\exception\GlobalException.java
+D:\java\online car-hailing\car_server\boot-common\boot-common-core\src\main\java\com\boot\common\core\utils\ExceptionUtil.java
+D:\java\online car-hailing\car_server\boot-common\boot-common-core\src\main\java\com\boot\common\core\annotation\Excel.java
+D:\java\online car-hailing\car_server\boot-common\boot-common-core\src\main\java\com\boot\common\core\constant\GenConstants.java
+D:\java\online car-hailing\car_server\boot-common\boot-common-core\src\main\java\com\boot\common\core\text\StrFormatter.java
+D:\java\online car-hailing\car_server\boot-common\boot-common-core\src\main\java\com\boot\common\core\constant\HttpStatus.java
+D:\java\online car-hailing\car_server\boot-common\boot-common-core\src\main\java\com\boot\common\core\utils\file\FileTypeUtils.java
+D:\java\online car-hailing\car_server\boot-common\boot-common-core\src\main\java\com\boot\common\core\exception\DemoModeException.java
+D:\java\online car-hailing\car_server\boot-common\boot-common-core\src\main\java\com\boot\common\core\utils\ServletUtils.java
+D:\java\online car-hailing\car_server\boot-common\boot-common-core\src\main\java\com\boot\common\core\text\CharsetKit.java
+D:\java\online car-hailing\car_server\boot-common\boot-common-core\src\main\java\com\boot\common\core\constant\ScheduleConstants.java
+D:\java\online car-hailing\car_server\boot-common\boot-common-core\src\main\java\com\boot\common\core\exception\file\FileNameLengthLimitExceededException.java
+D:\java\online car-hailing\car_server\boot-common\boot-common-core\src\main\java\com\boot\common\core\web\page\TableSupport.java
+D:\java\online car-hailing\car_server\boot-common\boot-common-core\src\main\java\com\boot\common\core\exception\base\BaseException.java
+D:\java\online car-hailing\car_server\boot-common\boot-common-core\src\main\java\com\boot\common\core\utils\JwtUtils.java
+D:\java\online car-hailing\car_server\boot-common\boot-common-core\src\main\java\com\boot\common\core\utils\file\FileUtils.java
+D:\java\online car-hailing\car_server\boot-common\boot-common-core\src\main\java\com\boot\common\core\constant\Constants.java
+D:\java\online car-hailing\car_server\boot-common\boot-common-core\src\main\java\com\boot\common\core\utils\reflect\ReflectUtils.java
+D:\java\online car-hailing\car_server\boot-common\boot-common-core\src\main\java\com\boot\common\core\web\page\PageDomain.java
+D:\java\online car-hailing\car_server\boot-common\boot-common-core\src\main\java\com\boot\common\core\exception\auth\NotLoginException.java

boot-common/boot-common-datascope/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -0,0 +1,2 @@
+D:\java\online car-hailing\car_server\boot-common\boot-common-datascope\src\main\java\com\boot\common\datascope\aspect\DataScopeAspect.java
+D:\java\online car-hailing\car_server\boot-common\boot-common-datascope\src\main\java\com\boot\common\datascope\annotation\DataScope.java

boot-common/boot-common-datasource/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -0,0 +1,2 @@
+D:\java\online car-hailing\car_server\boot-common\boot-common-datasource\src\main\java\com\boot\common\datasource\annotation\Master.java
+D:\java\online car-hailing\car_server\boot-common\boot-common-datasource\src\main\java\com\boot\common\datasource\annotation\Slave.java

boot-common/boot-common-log/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -0,0 +1,7 @@
+D:\java\online car-hailing\car_server\boot-common\boot-common-log\src\main\java\com\boot\common\log\enums\OperatorType.java
+D:\java\online car-hailing\car_server\boot-common\boot-common-log\src\main\java\com\boot\common\log\annotation\Log.java
+D:\java\online car-hailing\car_server\boot-common\boot-common-log\src\main\java\com\boot\common\log\aspect\LogAspect.java
+D:\java\online car-hailing\car_server\boot-common\boot-common-log\src\main\java\com\boot\common\log\enums\BusinessType.java
+D:\java\online car-hailing\car_server\boot-common\boot-common-log\src\main\java\com\boot\common\log\filter\PropertyPreExcludeFilter.java
+D:\java\online car-hailing\car_server\boot-common\boot-common-log\src\main\java\com\boot\common\log\enums\BusinessStatus.java
+D:\java\online car-hailing\car_server\boot-common\boot-common-log\src\main\java\com\boot\common\log\service\AsyncLogService.java

boot-common/boot-common-redis/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -0,0 +1,3 @@
+D:\java\online car-hailing\car_server\boot-common\boot-common-redis\src\main\java\com\boot\common\redis\configure\FastJson2JsonRedisSerializer.java
+D:\java\online car-hailing\car_server\boot-common\boot-common-redis\src\main\java\com\boot\common\redis\configure\RedisConfig.java
+D:\java\online car-hailing\car_server\boot-common\boot-common-redis\src\main\java\com\boot\common\redis\service\RedisService.java

boot-common/boot-common-security/src/main/java/com/boot/common/security/config/WebMvcConfig.java

@@ -12,7 +12,7 @@ import com.boot.common.security.interceptor.HeaderInterceptor;
 public class WebMvcConfig implements WebMvcConfigurer
 {
     /** 不需要拦截地址 */
-    public static final String[] excludeUrls = { "/login", "/logout", "/refresh" };
+    public static final String[] excludeUrls = { "/login", "/logout", "/refresh","/pay","/notify"};
 
     @Override
     public void addInterceptors(InterceptorRegistry registry)

boot-common/boot-common-security/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -0,0 +1,20 @@
+D:\java\online car-hailing\car_server\boot-common\boot-common-security\src\main\java\com\boot\common\security\annotation\RequiresRoles.java
+D:\java\online car-hailing\car_server\boot-common\boot-common-security\src\main\java\com\boot\common\security\feign\FeignAutoConfiguration.java
+D:\java\online car-hailing\car_server\boot-common\boot-common-security\src\main\java\com\boot\common\security\config\ApplicationConfig.java
+D:\java\online car-hailing\car_server\boot-common\boot-common-security\src\main\java\com\boot\common\security\annotation\RequiresLogin.java
+D:\java\online car-hailing\car_server\boot-common\boot-common-security\src\main\java\com\boot\common\security\annotation\RequiresPermissions.java
+D:\java\online car-hailing\car_server\boot-common\boot-common-security\src\main\java\com\boot\common\security\interceptor\HeaderInterceptor.java
+D:\java\online car-hailing\car_server\boot-common\boot-common-security\src\main\java\com\boot\common\security\aspect\PreAuthorizeAspect.java
+D:\java\online car-hailing\car_server\boot-common\boot-common-security\src\main\java\com\boot\common\security\annotation\Logical.java
+D:\java\online car-hailing\car_server\boot-common\boot-common-security\src\main\java\com\boot\common\security\service\TokenService.java
+D:\java\online car-hailing\car_server\boot-common\boot-common-security\src\main\java\com\boot\common\security\utils\SecurityUtils.java
+D:\java\online car-hailing\car_server\boot-common\boot-common-security\src\main\java\com\boot\common\security\auth\AuthUtil.java
+D:\java\online car-hailing\car_server\boot-common\boot-common-security\src\main\java\com\boot\common\security\config\WebMvcConfig.java
+D:\java\online car-hailing\car_server\boot-common\boot-common-security\src\main\java\com\boot\common\security\annotation\InnerAuth.java
+D:\java\online car-hailing\car_server\boot-common\boot-common-security\src\main\java\com\boot\common\security\annotation\EnableCustomConfig.java
+D:\java\online car-hailing\car_server\boot-common\boot-common-security\src\main\java\com\boot\common\security\auth\AuthLogic.java
+D:\java\online car-hailing\car_server\boot-common\boot-common-security\src\main\java\com\boot\common\security\utils\DictUtils.java
+D:\java\online car-hailing\car_server\boot-common\boot-common-security\src\main\java\com\boot\common\security\feign\FeignRequestInterceptor.java
+D:\java\online car-hailing\car_server\boot-common\boot-common-security\src\main\java\com\boot\common\security\handler\GlobalExceptionHandler.java
+D:\java\online car-hailing\car_server\boot-common\boot-common-security\src\main\java\com\boot\common\security\aspect\InnerAuthAspect.java
+D:\java\online car-hailing\car_server\boot-common\boot-common-security\src\main\java\com\boot\common\security\annotation\EnableRyFeignClients.java

boot-common/boot-common-swagger/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -0,0 +1,5 @@
+D:\java\online car-hailing\car_server\boot-common\boot-common-swagger\src\main\java\com\boot\common\swagger\annotation\EnableCustomSwagger2.java
+D:\java\online car-hailing\car_server\boot-common\boot-common-swagger\src\main\java\com\boot\common\swagger\config\SwaggerWebConfiguration.java
+D:\java\online car-hailing\car_server\boot-common\boot-common-swagger\src\main\java\com\boot\common\swagger\config\SwaggerAutoConfiguration.java
+D:\java\online car-hailing\car_server\boot-common\boot-common-swagger\src\main\java\com\boot\common\swagger\config\SwaggerBeanPostProcessor.java
+D:\java\online car-hailing\car_server\boot-common\boot-common-swagger\src\main\java\com\boot\common\swagger\config\SwaggerProperties.java

boot-gateway/src/main/resources/bootstrap.yml

@@ -15,7 +15,7 @@ spring:
       discovery:
         # 服务注册地址
         server-addr: 122.152.215.207:8848
-        namespace: 305eac8a-d1bd-4c64-8945-ad0c19c359c5
+        namespace: wdwdwd
       config:
         # 配置中心地址
         server-addr: 122.152.215.207:8848
@@ -24,7 +24,7 @@ spring:
         # 共享配置
         shared-configs:
           - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
-        namespace: 305eac8a-d1bd-4c64-8945-ad0c19c359c5
+        namespace: wdwdwd
     sentinel:
       # 取消控制台懒加载
       eager: true

boot-gateway/target/classes/bootstrap.yml

@@ -0,0 +1,42 @@
+# Tomcat
+server:
+  port: 8080
+
+# Spring
+spring:
+  application:
+    # 应用名称
+    name: boot-gateway
+  profiles:
+    # 环境配置
+    active: dev
+  cloud:
+    nacos:
+      discovery:
+        # 服务注册地址
+        server-addr: 122.152.215.207:8848
+        namespace: wdwdwd
+      config:
+        # 配置中心地址
+        server-addr: 122.152.215.207:8848
+        # 配置文件格式
+        file-extension: yml
+        # 共享配置
+        shared-configs:
+          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+        namespace: wdwdwd
+    sentinel:
+      # 取消控制台懒加载
+      eager: true
+      transport:
+        # 控制台地址
+        dashboard: 127.0.0.1:8718
+      # nacos配置持久化
+      datasource:
+        ds1:
+          nacos:
+            server-addr: 122.152.215.207:8848
+            dataId: sentinel-boot-gateway
+            groupId: DEFAULT_GROUP
+            data-type: json
+            rule-type: gw-flow

boot-gateway/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -0,0 +1,20 @@
+D:\java\online car-hailing\car_server\boot-gateway\src\main\java\com\boot\gateway\handler\SentinelFallbackHandler.java
+D:\java\online car-hailing\car_server\boot-gateway\src\main\java\com\boot\gateway\config\properties\IgnoreWhiteProperties.java
+D:\java\online car-hailing\car_server\boot-gateway\src\main\java\com\boot\gateway\config\RouterFunctionConfiguration.java
+D:\java\online car-hailing\car_server\boot-gateway\src\main\java\com\boot\gateway\filter\XssFilter.java
+D:\java\online car-hailing\car_server\boot-gateway\src\main\java\com\boot\gateway\config\properties\CaptchaProperties.java
+D:\java\online car-hailing\car_server\boot-gateway\src\main\java\com\boot\gateway\filter\ValidateCodeFilter.java
+D:\java\online car-hailing\car_server\boot-gateway\src\main\java\com\boot\gateway\config\CaptchaConfig.java
+D:\java\online car-hailing\car_server\boot-gateway\src\main\java\com\boot\gateway\filter\CacheRequestFilter.java
+D:\java\online car-hailing\car_server\boot-gateway\src\main\java\com\boot\gateway\filter\AuthFilter.java
+D:\java\online car-hailing\car_server\boot-gateway\src\main\java\com\boot\gateway\service\impl\ValidateCodeServiceImpl.java
+D:\java\online car-hailing\car_server\boot-gateway\src\main\java\com\boot\gateway\service\ValidateCodeService.java
+D:\java\online car-hailing\car_server\boot-gateway\src\main\java\com\boot\gateway\handler\ValidateCodeHandler.java
+D:\java\online car-hailing\car_server\boot-gateway\src\main\java\com\boot\gateway\config\properties\XssProperties.java
+D:\java\online car-hailing\car_server\boot-gateway\src\main\java\com\boot\gateway\filter\BlackListUrlFilter.java
+D:\java\online car-hailing\car_server\boot-gateway\src\main\java\com\boot\gateway\handler\GatewayExceptionHandler.java
+D:\java\online car-hailing\car_server\boot-gateway\src\main\java\com\boot\gateway\handler\SwaggerHandler.java
+D:\java\online car-hailing\car_server\boot-gateway\src\main\java\com\boot\gateway\config\KaptchaTextCreator.java
+D:\java\online car-hailing\car_server\boot-gateway\src\main\java\com\boot\gateway\config\SwaggerProvider.java
+D:\java\online car-hailing\car_server\boot-gateway\src\main\java\com\boot\gateway\config\GatewayConfig.java
+D:\java\online car-hailing\car_server\boot-gateway\src\main\java\com\boot\gateway\BootGatewayApplication.java

boot-modules/boot-file/boot-file-common/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -0,0 +1,2 @@
+D:\java\online car-hailing\car_server\boot-modules\boot-file\boot-file-common\src\main\java\com\boot\file\common\utils\FileUploadUtils.java
+D:\java\online car-hailing\car_server\boot-modules\boot-file\boot-file-common\src\main\java\com\boot\file\common\domain\SysFile.java

boot-modules/boot-file/boot-file-remote/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -0,0 +1,2 @@
+D:\java\online car-hailing\car_server\boot-modules\boot-file\boot-file-remote\src\main\java\com\boot\file\remote\factory\RemoteFileFallbackFactory.java
+D:\java\online car-hailing\car_server\boot-modules\boot-file\boot-file-remote\src\main\java\com\boot\file\remote\RemoteFileService.java

boot-modules/boot-file/boot-file-server/src/main/resources/bootstrap.yml

@@ -15,7 +15,7 @@ spring:
       discovery:
         # 服务注册地址
         server-addr: 122.152.215.207:8848
-        namespace: 305eac8a-d1bd-4c64-8945-ad0c19c359c5
+        namespace: wdwdwd
       config:
         # 配置中心地址
         server-addr: 122.152.215.207:8848
@@ -24,4 +24,4 @@ spring:
         # 共享配置
         shared-configs:
           - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
-        namespace: 305eac8a-d1bd-4c64-8945-ad0c19c359c5
+        namespace: wdwdwd

boot-modules/boot-file/boot-file-server/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -0,0 +1,8 @@
+D:\java\online car-hailing\car_server\boot-modules\boot-file\boot-file-server\src\main\java\com\boot\file\config\MinioConfig.java
+D:\java\online car-hailing\car_server\boot-modules\boot-file\boot-file-server\src\main\java\com\boot\file\controller\SysFileController.java
+D:\java\online car-hailing\car_server\boot-modules\boot-file\boot-file-server\src\main\java\com\boot\file\service\ISysFileService.java
+D:\java\online car-hailing\car_server\boot-modules\boot-file\boot-file-server\src\main\java\com\boot\file\service\FastDfsSysFileServiceImpl.java
+D:\java\online car-hailing\car_server\boot-modules\boot-file\boot-file-server\src\main\java\com\boot\file\service\MinioSysFileServiceImpl.java
+D:\java\online car-hailing\car_server\boot-modules\boot-file\boot-file-server\src\main\java\com\boot\file\config\ResourcesConfig.java
+D:\java\online car-hailing\car_server\boot-modules\boot-file\boot-file-server\src\main\java\com\boot\file\service\LocalSysFileServiceImpl.java
+D:\java\online car-hailing\car_server\boot-modules\boot-file\boot-file-server\src\main\java\com\boot\file\BootFileApplication.java

boot-modules/boot-gen/src/main/resources/bootstrap.yml

@@ -15,7 +15,7 @@ spring:
       discovery:
         # 服务注册地址
         server-addr: 122.152.215.207:8848
-        namespace: 305eac8a-d1bd-4c64-8945-ad0c19c359c5
+        namespace: wdwdwd
       config:
         # 配置中心地址
         server-addr: 122.152.215.207:8848
@@ -24,4 +24,4 @@ spring:
         # 共享配置
         shared-configs:
           - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
-        namespace: 305eac8a-d1bd-4c64-8945-ad0c19c359c5
+        namespace: wdwdwd

boot-modules/boot-gen/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -0,0 +1,14 @@
+D:\java\online car-hailing\car_server\boot-modules\boot-gen\src\main\java\com\boot\gen\service\GenTableColumnServiceImpl.java
+D:\java\online car-hailing\car_server\boot-modules\boot-gen\src\main\java\com\boot\gen\util\VelocityInitializer.java
+D:\java\online car-hailing\car_server\boot-modules\boot-gen\src\main\java\com\boot\gen\service\IGenTableService.java
+D:\java\online car-hailing\car_server\boot-modules\boot-gen\src\main\java\com\boot\gen\BootGenApplication.java
+D:\java\online car-hailing\car_server\boot-modules\boot-gen\src\main\java\com\boot\gen\mapper\GenTableColumnMapper.java
+D:\java\online car-hailing\car_server\boot-modules\boot-gen\src\main\java\com\boot\gen\util\VelocityUtils.java
+D:\java\online car-hailing\car_server\boot-modules\boot-gen\src\main\java\com\boot\gen\controller\GenController.java
+D:\java\online car-hailing\car_server\boot-modules\boot-gen\src\main\java\com\boot\gen\service\GenTableServiceImpl.java
+D:\java\online car-hailing\car_server\boot-modules\boot-gen\src\main\java\com\boot\gen\service\IGenTableColumnService.java
+D:\java\online car-hailing\car_server\boot-modules\boot-gen\src\main\java\com\boot\gen\domain\GenTableColumn.java
+D:\java\online car-hailing\car_server\boot-modules\boot-gen\src\main\java\com\boot\gen\util\GenUtils.java
+D:\java\online car-hailing\car_server\boot-modules\boot-gen\src\main\java\com\boot\gen\config\GenConfig.java
+D:\java\online car-hailing\car_server\boot-modules\boot-gen\src\main\java\com\boot\gen\domain\GenTable.java
+D:\java\online car-hailing\car_server\boot-modules\boot-gen\src\main\java\com\boot\gen\mapper\GenTableMapper.java

boot-modules/boot-job/src/main/resources/bootstrap.yml

@@ -15,7 +15,7 @@ spring:
       discovery:
         # 服务注册地址
         server-addr: 122.152.215.207:8848
-        namespace: 305eac8a-d1bd-4c64-8945-ad0c19c359c5
+        namespace: wdwdwd
       config:
         # 配置中心地址
         server-addr: 122.152.215.207:8848
@@ -24,4 +24,4 @@ spring:
         # 共享配置
         shared-configs:
           - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
-        namespace: 305eac8a-d1bd-4c64-8945-ad0c19c359c5
+        namespace: wdwdwd

boot-modules/boot-job/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -0,0 +1,19 @@
+D:\java\online car-hailing\car_server\boot-modules\boot-job\src\main\java\com\boot\job\mapper\SysJobLogMapper.java
+D:\java\online car-hailing\car_server\boot-modules\boot-job\src\main\java\com\boot\job\controller\SysJobLogController.java
+D:\java\online car-hailing\car_server\boot-modules\boot-job\src\main\java\com\boot\job\util\ScheduleUtils.java
+D:\java\online car-hailing\car_server\boot-modules\boot-job\src\main\java\com\boot\job\domain\SysJobLog.java
+D:\java\online car-hailing\car_server\boot-modules\boot-job\src\main\java\com\boot\job\util\QuartzJobExecution.java
+D:\java\online car-hailing\car_server\boot-modules\boot-job\src\main\java\com\boot\job\task\RyTask.java
+D:\java\online car-hailing\car_server\boot-modules\boot-job\src\main\java\com\boot\job\domain\SysJob.java
+D:\java\online car-hailing\car_server\boot-modules\boot-job\src\main\java\com\boot\job\config\ScheduleConfig.java
+D:\java\online car-hailing\car_server\boot-modules\boot-job\src\main\java\com\boot\job\service\SysJobLogServiceImpl.java
+D:\java\online car-hailing\car_server\boot-modules\boot-job\src\main\java\com\boot\job\service\ISysJobService.java
+D:\java\online car-hailing\car_server\boot-modules\boot-job\src\main\java\com\boot\job\service\SysJobServiceImpl.java
+D:\java\online car-hailing\car_server\boot-modules\boot-job\src\main\java\com\boot\job\BootJobApplication.java
+D:\java\online car-hailing\car_server\boot-modules\boot-job\src\main\java\com\boot\job\util\CronUtils.java
+D:\java\online car-hailing\car_server\boot-modules\boot-job\src\main\java\com\boot\job\util\JobInvokeUtil.java
+D:\java\online car-hailing\car_server\boot-modules\boot-job\src\main\java\com\boot\job\util\QuartzDisallowConcurrentExecution.java
+D:\java\online car-hailing\car_server\boot-modules\boot-job\src\main\java\com\boot\job\controller\SysJobController.java
+D:\java\online car-hailing\car_server\boot-modules\boot-job\src\main\java\com\boot\job\mapper\SysJobMapper.java
+D:\java\online car-hailing\car_server\boot-modules\boot-job\src\main\java\com\boot\job\util\AbstractQuartzJob.java
+D:\java\online car-hailing\car_server\boot-modules\boot-job\src\main\java\com\boot\job\service\ISysJobLogService.java

boot-modules/boot-system/boot-system-common/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -0,0 +1,20 @@
+D:\java\online car-hailing\car_server\boot-modules\boot-system\boot-system-common\src\main\java\com\boot\system\common\domain\SysPost.java
+D:\java\online car-hailing\car_server\boot-modules\boot-system\boot-system-common\src\main\java\com\boot\system\common\domain\SysUserRole.java
+D:\java\online car-hailing\car_server\boot-modules\boot-system\boot-system-common\src\main\java\com\boot\system\common\domain\SysOperLog.java
+D:\java\online car-hailing\car_server\boot-modules\boot-system\boot-system-common\src\main\java\com\boot\system\common\domain\vo\TreeSelect.java
+D:\java\online car-hailing\car_server\boot-modules\boot-system\boot-system-common\src\main\java\com\boot\system\common\domain\SysDictType.java
+D:\java\online car-hailing\car_server\boot-modules\boot-system\boot-system-common\src\main\java\com\boot\system\common\domain\SysRoleDept.java
+D:\java\online car-hailing\car_server\boot-modules\boot-system\boot-system-common\src\main\java\com\boot\system\common\domain\SysConfig.java
+D:\java\online car-hailing\car_server\boot-modules\boot-system\boot-system-common\src\main\java\com\boot\system\common\domain\SysMenu.java
+D:\java\online car-hailing\car_server\boot-modules\boot-system\boot-system-common\src\main\java\com\boot\system\common\domain\SysRoleMenu.java
+D:\java\online car-hailing\car_server\boot-modules\boot-system\boot-system-common\src\main\java\com\boot\system\common\domain\SysDept.java
+D:\java\online car-hailing\car_server\boot-modules\boot-system\boot-system-common\src\main\java\com\boot\system\common\domain\vo\RouterVo.java
+D:\java\online car-hailing\car_server\boot-modules\boot-system\boot-system-common\src\main\java\com\boot\system\common\domain\SysDictData.java
+D:\java\online car-hailing\car_server\boot-modules\boot-system\boot-system-common\src\main\java\com\boot\system\common\domain\SysNotice.java
+D:\java\online car-hailing\car_server\boot-modules\boot-system\boot-system-common\src\main\java\com\boot\system\common\domain\SysUserPost.java
+D:\java\online car-hailing\car_server\boot-modules\boot-system\boot-system-common\src\main\java\com\boot\system\common\domain\SysLogininfor.java
+D:\java\online car-hailing\car_server\boot-modules\boot-system\boot-system-common\src\main\java\com\boot\system\common\domain\model\LoginUser.java
+D:\java\online car-hailing\car_server\boot-modules\boot-system\boot-system-common\src\main\java\com\boot\system\common\domain\SysRole.java
+D:\java\online car-hailing\car_server\boot-modules\boot-system\boot-system-common\src\main\java\com\boot\system\common\domain\SysUser.java
+D:\java\online car-hailing\car_server\boot-modules\boot-system\boot-system-common\src\main\java\com\boot\system\common\domain\vo\MetaVo.java
+D:\java\online car-hailing\car_server\boot-modules\boot-system\boot-system-common\src\main\java\com\boot\system\common\domain\SysUserOnline.java

boot-modules/boot-system/boot-system-remote/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -0,0 +1,4 @@
+D:\java\online car-hailing\car_server\boot-modules\boot-system\boot-system-remote\src\main\java\com\boot\system\remote\factory\RemoteLogFallbackFactory.java
+D:\java\online car-hailing\car_server\boot-modules\boot-system\boot-system-remote\src\main\java\com\boot\system\remote\factory\RemoteUserFallbackFactory.java
+D:\java\online car-hailing\car_server\boot-modules\boot-system\boot-system-remote\src\main\java\com\boot\system\remote\RemoteLogService.java
+D:\java\online car-hailing\car_server\boot-modules\boot-system\boot-system-remote\src\main\java\com\boot\system\remote\RemoteUserService.java

boot-modules/boot-system/boot-system-server/src/main/resources/bootstrap.yml

@@ -15,7 +15,7 @@ spring:
       discovery:
         # 服务注册地址
         server-addr: 122.152.215.207:8848
-        namespace: 305eac8a-d1bd-4c64-8945-ad0c19c359c5
+        namespace: wdwdwd
       config:
         # 配置中心地址
         server-addr: 122.152.215.207:8848
@@ -24,4 +24,4 @@ spring:
         # 共享配置
         shared-configs:
           - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
-        namespace: 305eac8a-d1bd-4c64-8945-ad0c19c359c5
+        namespace: wdwdwd

boot-modules/boot-system/boot-system-server/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -0,0 +1,55 @@
+D:\java\online car-hailing\car_server\boot-modules\boot-system\boot-system-server\src\main\java\com\boot\system\service\impl\SysUserServiceImpl.java
+D:\java\online car-hailing\car_server\boot-modules\boot-system\boot-system-server\src\main\java\com\boot\system\service\impl\SysDictDataServiceImpl.java
+D:\java\online car-hailing\car_server\boot-modules\boot-system\boot-system-server\src\main\java\com\boot\system\service\ISysDeptService.java
+D:\java\online car-hailing\car_server\boot-modules\boot-system\boot-system-server\src\main\java\com\boot\system\controller\SysPostController.java
+D:\java\online car-hailing\car_server\boot-modules\boot-system\boot-system-server\src\main\java\com\boot\system\service\ISysNoticeService.java
+D:\java\online car-hailing\car_server\boot-modules\boot-system\boot-system-server\src\main\java\com\boot\system\mapper\SysRoleMenuMapper.java
+D:\java\online car-hailing\car_server\boot-modules\boot-system\boot-system-server\src\main\java\com\boot\system\mapper\SysRoleDeptMapper.java
+D:\java\online car-hailing\car_server\boot-modules\boot-system\boot-system-server\src\main\java\com\boot\system\service\impl\SysDictTypeServiceImpl.java
+D:\java\online car-hailing\car_server\boot-modules\boot-system\boot-system-server\src\main\java\com\boot\system\mapper\SysDeptMapper.java
+D:\java\online car-hailing\car_server\boot-modules\boot-system\boot-system-server\src\main\java\com\boot\system\controller\SysProfileController.java
+D:\java\online car-hailing\car_server\boot-modules\boot-system\boot-system-server\src\main\java\com\boot\system\BootSystemApplication.java
+D:\java\online car-hailing\car_server\boot-modules\boot-system\boot-system-server\src\main\java\com\boot\system\mapper\SysRoleMapper.java
+D:\java\online car-hailing\car_server\boot-modules\boot-system\boot-system-server\src\main\java\com\boot\system\service\ISysRoleService.java
+D:\java\online car-hailing\car_server\boot-modules\boot-system\boot-system-server\src\main\java\com\boot\system\mapper\SysUserPostMapper.java
+D:\java\online car-hailing\car_server\boot-modules\boot-system\boot-system-server\src\main\java\com\boot\system\mapper\SysMenuMapper.java
+D:\java\online car-hailing\car_server\boot-modules\boot-system\boot-system-server\src\main\java\com\boot\system\mapper\SysUserMapper.java
+D:\java\online car-hailing\car_server\boot-modules\boot-system\boot-system-server\src\main\java\com\boot\system\mapper\SysUserRoleMapper.java
+D:\java\online car-hailing\car_server\boot-modules\boot-system\boot-system-server\src\main\java\com\boot\system\mapper\SysDictDataMapper.java
+D:\java\online car-hailing\car_server\boot-modules\boot-system\boot-system-server\src\main\java\com\boot\system\service\impl\SysOperLogServiceImpl.java
+D:\java\online car-hailing\car_server\boot-modules\boot-system\boot-system-server\src\main\java\com\boot\system\controller\SysLogininforController.java
+D:\java\online car-hailing\car_server\boot-modules\boot-system\boot-system-server\src\main\java\com\boot\system\service\ISysUserOnlineService.java
+D:\java\online car-hailing\car_server\boot-modules\boot-system\boot-system-server\src\main\java\com\boot\system\controller\SysUserController.java
+D:\java\online car-hailing\car_server\boot-modules\boot-system\boot-system-server\src\main\java\com\boot\system\controller\SysDictTypeController.java
+D:\java\online car-hailing\car_server\boot-modules\boot-system\boot-system-server\src\main\java\com\boot\system\service\ISysConfigService.java
+D:\java\online car-hailing\car_server\boot-modules\boot-system\boot-system-server\src\main\java\com\boot\system\service\ISysUserService.java
+D:\java\online car-hailing\car_server\boot-modules\boot-system\boot-system-server\src\main\java\com\boot\system\mapper\SysNoticeMapper.java
+D:\java\online car-hailing\car_server\boot-modules\boot-system\boot-system-server\src\main\java\com\boot\system\service\ISysDictDataService.java
+D:\java\online car-hailing\car_server\boot-modules\boot-system\boot-system-server\src\main\java\com\boot\system\controller\SysUserOnlineController.java
+D:\java\online car-hailing\car_server\boot-modules\boot-system\boot-system-server\src\main\java\com\boot\system\controller\SysMenuController.java
+D:\java\online car-hailing\car_server\boot-modules\boot-system\boot-system-server\src\main\java\com\boot\system\service\ISysMenuService.java
+D:\java\online car-hailing\car_server\boot-modules\boot-system\boot-system-server\src\main\java\com\boot\system\mapper\SysLogininforMapper.java
+D:\java\online car-hailing\car_server\boot-modules\boot-system\boot-system-server\src\main\java\com\boot\system\service\impl\SysUserOnlineServiceImpl.java
+D:\java\online car-hailing\car_server\boot-modules\boot-system\boot-system-server\src\main\java\com\boot\system\controller\SysDeptController.java
+D:\java\online car-hailing\car_server\boot-modules\boot-system\boot-system-server\src\main\java\com\boot\system\service\ISysPermissionService.java
+D:\java\online car-hailing\car_server\boot-modules\boot-system\boot-system-server\src\main\java\com\boot\system\controller\SysRoleController.java
+D:\java\online car-hailing\car_server\boot-modules\boot-system\boot-system-server\src\main\java\com\boot\system\controller\SysNoticeController.java
+D:\java\online car-hailing\car_server\boot-modules\boot-system\boot-system-server\src\main\java\com\boot\system\controller\SysDictDataController.java
+D:\java\online car-hailing\car_server\boot-modules\boot-system\boot-system-server\src\main\java\com\boot\system\service\impl\SysPostServiceImpl.java
+D:\java\online car-hailing\car_server\boot-modules\boot-system\boot-system-server\src\main\java\com\boot\system\service\impl\SysLogininforServiceImpl.java
+D:\java\online car-hailing\car_server\boot-modules\boot-system\boot-system-server\src\main\java\com\boot\system\service\impl\SysNoticeServiceImpl.java
+D:\java\online car-hailing\car_server\boot-modules\boot-system\boot-system-server\src\main\java\com\boot\system\service\impl\SysMenuServiceImpl.java
+D:\java\online car-hailing\car_server\boot-modules\boot-system\boot-system-server\src\main\java\com\boot\system\service\ISysOperLogService.java
+D:\java\online car-hailing\car_server\boot-modules\boot-system\boot-system-server\src\main\java\com\boot\system\service\ISysLogininforService.java
+D:\java\online car-hailing\car_server\boot-modules\boot-system\boot-system-server\src\main\java\com\boot\system\mapper\SysConfigMapper.java
+D:\java\online car-hailing\car_server\boot-modules\boot-system\boot-system-server\src\main\java\com\boot\system\service\ISysDictTypeService.java
+D:\java\online car-hailing\car_server\boot-modules\boot-system\boot-system-server\src\main\java\com\boot\system\mapper\SysPostMapper.java
+D:\java\online car-hailing\car_server\boot-modules\boot-system\boot-system-server\src\main\java\com\boot\system\service\impl\SysRoleServiceImpl.java
+D:\java\online car-hailing\car_server\boot-modules\boot-system\boot-system-server\src\main\java\com\boot\system\controller\SysConfigController.java
+D:\java\online car-hailing\car_server\boot-modules\boot-system\boot-system-server\src\main\java\com\boot\system\service\impl\SysPermissionServiceImpl.java
+D:\java\online car-hailing\car_server\boot-modules\boot-system\boot-system-server\src\main\java\com\boot\system\service\ISysPostService.java
+D:\java\online car-hailing\car_server\boot-modules\boot-system\boot-system-server\src\main\java\com\boot\system\mapper\SysDictTypeMapper.java
+D:\java\online car-hailing\car_server\boot-modules\boot-system\boot-system-server\src\main\java\com\boot\system\service\impl\SysDeptServiceImpl.java
+D:\java\online car-hailing\car_server\boot-modules\boot-system\boot-system-server\src\main\java\com\boot\system\controller\SysOperlogController.java
+D:\java\online car-hailing\car_server\boot-modules\boot-system\boot-system-server\src\main\java\com\boot\system\mapper\SysOperLogMapper.java
+D:\java\online car-hailing\car_server\boot-modules\boot-system\boot-system-server\src\main\java\com\boot\system\service\impl\SysConfigServiceImpl.java

boot-valuation-rule/boot-valuation-rule-server/src/main/resources/bootstrap.yml

@@ -1,12 +1,12 @@
 # Tomcat
 server:
-  port: 9502
+  port: 9300
 
 # Spring
 spring:
   application:
     # 应用名称
-    name: boot-valuation-rule
+    name: boot-file
   profiles:
     # 环境配置
     active: dev
@@ -15,7 +15,7 @@ spring:
       discovery:
         # 服务注册地址
         server-addr: 122.152.215.207:8848
-        namespace: 305eac8a-d1bd-4c64-8945-ad0c19c359c5
+        namespace: wdwdwd
       config:
         # 配置中心地址
         server-addr: 122.152.215.207:8848
@@ -24,4 +24,4 @@ spring:
         # 共享配置
         shared-configs:
           - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
-        namespace: 305eac8a-d1bd-4c64-8945-ad0c19c359c5
+        namespace: wdwdwd

boot-valuation-rule/boot-valuation-rule-server/target/classes/bootstrap.yml

@@ -1,12 +1,12 @@
 # Tomcat
 server:
-  port: 9502
+  port: 9202
 
 # Spring
 spring:
   application:
     # 应用名称
-    name: boot-valuation-rule
+    name: boot-gen
   profiles:
     # 环境配置
     active: dev
@@ -15,7 +15,7 @@ spring:
       discovery:
         # 服务注册地址
         server-addr: 122.152.215.207:8848
-        namespace: 305eac8a-d1bd-4c64-8945-ad0c19c359c5
+        namespace: wdwdwd
       config:
         # 配置中心地址
         server-addr: 122.152.215.207:8848
@@ -24,4 +24,4 @@ spring:
         # 共享配置
         shared-configs:
           - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
-        namespace: 305eac8a-d1bd-4c64-8945-ad0c19c359c5
+        namespace: wdwdwd

boot-valuation/boot-valuation-server/src/main/resources/bootstrap.yml

@@ -1,12 +1,12 @@
 # Tomcat
 server:
-  port: 9501
+  port: 9203
 
 # Spring
 spring:
   application:
     # 应用名称
-    name: boot-valuation
+    name: boot-job
   profiles:
     # 环境配置
     active: dev
@@ -15,7 +15,7 @@ spring:
       discovery:
         # 服务注册地址
         server-addr: 122.152.215.207:8848
-        namespace: 305eac8a-d1bd-4c64-8945-ad0c19c359c5
+        namespace: wdwdwd
       config:
         # 配置中心地址
         server-addr: 122.152.215.207:8848
@@ -24,4 +24,4 @@ spring:
         # 共享配置
         shared-configs:
           - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
-        namespace: 305eac8a-d1bd-4c64-8945-ad0c19c359c5
+        namespace: wdwdwd

boot-valuation/boot-valuation-server/target/classes/bootstrap.yml

@@ -1,12 +1,12 @@
 # Tomcat
 server:
-  port: 9501
+  port: 9201
 
 # Spring
 spring:
   application:
     # 应用名称
-    name: boot-valuation
+    name: boot-system
   profiles:
     # 环境配置
     active: dev
@@ -15,7 +15,7 @@ spring:
       discovery:
         # 服务注册地址
         server-addr: 122.152.215.207:8848
-        namespace: 305eac8a-d1bd-4c64-8945-ad0c19c359c5
+        namespace: wdwdwd
       config:
         # 配置中心地址
         server-addr: 122.152.215.207:8848
@@ -24,4 +24,4 @@ spring:
         # 共享配置
         shared-configs:
           - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
-        namespace: 305eac8a-d1bd-4c64-8945-ad0c19c359c5
+        namespace: wdwdwd

boot-visual/boot-monitor/src/main/resources/bootstrap.yml

@@ -15,7 +15,7 @@ spring:
       discovery:
         # 服务注册地址
         server-addr: 122.152.215.207:8848
-        namespace: 305eac8a-d1bd-4c64-8945-ad0c19c359c5
+        namespace: wdwdwd
       config:
         # 配置中心地址
         server-addr: 122.152.215.207:8848
@@ -24,4 +24,4 @@ spring:
         # 共享配置
         shared-configs:
           - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
-        namespace: 305eac8a-d1bd-4c64-8945-ad0c19c359c5
+        namespace: wdwdwd

boot-visual/boot-monitor/target/classes/bootstrap.yml

@@ -0,0 +1,27 @@
+# Tomcat
+server:
+  port: 9101
+
+# Spring
+spring:
+  application:
+    # 应用名称
+    name: boot-monitor
+  profiles:
+    # 环境配置
+    active: dev
+  cloud:
+    nacos:
+      discovery:
+        # 服务注册地址
+        server-addr: 122.152.215.207:8848
+        namespace: wdwdwd
+      config:
+        # 配置中心地址
+        server-addr: 122.152.215.207:8848
+        # 配置文件格式
+        file-extension: yml
+        # 共享配置
+        shared-configs:
+          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+        namespace: wdwdwd

boot-visual/boot-monitor/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -0,0 +1,2 @@
+D:\java\online car-hailing\car_server\boot-visual\boot-monitor\src\main\java\com\boot\modules\monitor\config\WebSecurityConfigurer.java
+D:\java\online car-hailing\car_server\boot-visual\boot-monitor\src\main\java\com\boot\modules\monitor\BootMonitorApplication.java

car-charging/car-charging-common/pom.xml

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>com.bawei</groupId>
+		<artifactId>car-charging</artifactId>
+		<version>3.6.3</version>
+	</parent>
+
+	<artifactId>car-charging-common</artifactId>
+
+	<properties>
+		<maven.compiler.source>17</maven.compiler.source>
+		<maven.compiler.target>17</maven.compiler.target>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+	</properties>
+
+
+	<dependencies>
+		<!--        系统服务 公共依赖-->
+		<dependency>
+			<groupId>com.boot</groupId>
+			<artifactId>boot-common-core</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.projectlombok</groupId>
+			<artifactId>lombok</artifactId>
+		</dependency>
+	</dependencies>
+
+</project>

car-charging/car-charging-common/src/main/java/com/car/charging/common/domain/Channel.java

@@ -0,0 +1,90 @@
+package com.car.charging.common.domain;
+
+import java.util.Date;
+
+/**
+ * @ClassName Channel
+ * @Description 描述
+ * @Author Di.Wu
+ * @Date 2024/2/26 9:42
+ */
+public class Channel {
+
+    private Integer channelId;
+    private String channelName;
+    private Date createTime;
+    private Integer createUser;
+    private Date updTime;
+    private Integer updUser;
+    private Integer isDel;
+
+
+    public Channel() {
+    }
+
+    public Channel(Integer channelId, String channelName, Date createTime, Integer createUser, Date updTime, Integer updUser, Integer isDel) {
+        this.channelId = channelId;
+        this.channelName = channelName;
+        this.createTime = createTime;
+        this.createUser = createUser;
+        this.updTime = updTime;
+        this.updUser = updUser;
+        this.isDel = isDel;
+    }
+
+    public Integer getChannelId() {
+        return channelId;
+    }
+
+    public void setChannelId(Integer channelId) {
+        this.channelId = channelId;
+    }
+
+    public String getChannelName() {
+        return channelName;
+    }
+
+    public void setChannelName(String channelName) {
+        this.channelName = channelName;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Integer getCreateUser() {
+        return createUser;
+    }
+
+    public void setCreateUser(Integer createUser) {
+        this.createUser = createUser;
+    }
+
+    public Date getUpdTime() {
+        return updTime;
+    }
+
+    public void setUpdTime(Date updTime) {
+        this.updTime = updTime;
+    }
+
+    public Integer getUpdUser() {
+        return updUser;
+    }
+
+    public void setUpdUser(Integer updUser) {
+        this.updUser = updUser;
+    }
+
+    public Integer getIsDel() {
+        return isDel;
+    }
+
+    public void setIsDel(Integer isDel) {
+        this.isDel = isDel;
+    }
+}

car-charging/car-charging-common/src/main/java/com/car/charging/common/domain/ChargingMiddleTable.java

@@ -0,0 +1,40 @@
+package com.car.charging.common.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+/**
+ * @ClassName ChargingMiddleTable
+ * @Description 描述
+ * @Author Di.Wu
+ * @Date 2024/2/26 14:02
+ */
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class ChargingMiddleTable {
+    private Integer id;
+    private Integer cityId;
+    private Integer channelId;
+    private Integer serverTypeId;
+    private Integer rankId;
+    private Integer estimatedId;
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date updateTime;
+    private String userName;
+    private Integer availableState;
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date createTime;
+
+
+
+
+}

car-charging/car-charging-common/src/main/java/com/car/charging/common/domain/City.java

@@ -0,0 +1,23 @@
+package com.car.charging.common.domain;
+
+import lombok.Data;
+
+/**
+ * @ClassName City 城市 类
+ * @Version 1.0
+ * @Description 描述
+ * @Author Di.Wu
+ * @Date 2024/2/26 9:31
+ */
+@Data
+public class City {
+
+
+    private Integer cityId;
+
+    private String cityName;
+
+
+
+
+}

car-charging/car-charging-common/src/main/java/com/car/charging/common/domain/EstimatedOrder.java

@@ -0,0 +1,40 @@
+package com.car.charging.common.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @ClassName EstimatedOrder
+ * @Description 描述
+ * @Author Di.Wu
+ * @Date 2024/2/27 19:56
+ */
+@Data
+public class EstimatedOrder {
+
+    private Integer id;
+    private Integer cityId;
+    private Integer serverTypeId;
+    private Integer channelId;
+    private Integer rankId;
+    private Integer kilometres;
+    private Integer serverTime;
+    private BigDecimal mealPrice;
+    private BigDecimal basicsPrice;
+    private Integer nightId;
+    private String sectionId;
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date createTime;
+
+
+
+
+
+
+
+}

car-charging/car-charging-common/src/main/java/com/car/charging/common/domain/NightServer.java

@@ -0,0 +1,26 @@
+package com.car.charging.common.domain;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @ClassName NightServer
+ * @Description 描述
+ * @Author Di.Wu
+ * @Date 2024/2/27 19:53
+ */
+@Data
+public class NightServer {
+
+
+    private Integer id;
+    private Double nightServerMileagePrice;
+    private BigDecimal nightServerTimePrice;
+    private BigDecimal mileagePrice;
+    private BigDecimal timePrice;
+    private Double longWayMileage;
+    private BigDecimal longWayPrice;
+
+
+}

car-charging/car-charging-common/src/main/java/com/car/charging/common/domain/Rank.java

@@ -0,0 +1,36 @@
+package com.car.charging.common.domain;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+
+/**
+ * @ClassName Rank
+ * @Description 描述
+ * @Author Di.Wu
+ * @Date 2024/2/26 9:44
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+
+
+
+
+public class Rank {
+
+    private Integer rankId;
+    private String rankName;
+    private Date createTime;
+    private Integer createUser;
+    private Date updTime;
+    private Integer updUser;
+    private Integer isDel;
+
+
+
+
+
+}

car-charging/car-charging-common/src/main/java/com/car/charging/common/domain/Section.java

@@ -0,0 +1,28 @@
+package com.car.charging.common.domain;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+
+/**
+ * @ClassName Section
+ * @Description 描述
+ * @Author Di.Wu
+ * @Date 2024/2/28 22:04
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class Section {
+
+
+    private Integer id;
+    private Integer startTime;
+    private Integer endTime;
+    private BigDecimal kilometrePrice;
+    private BigDecimal timePrice;
+
+
+}

car-charging/car-charging-common/src/main/java/com/car/charging/common/domain/req/AddChannel.java

@@ -0,0 +1,82 @@
+package com.car.charging.common.domain.req;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.format.annotation.DateTimeFormat;
+import com.car.charging.common.domain.Section;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @ClassName AddChannel
+ * @Description 描述
+ * @Author Di.Wu
+ * @Date 2024/2/28 15:36
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class AddChannel {
+
+    private Integer id;
+
+    private Integer cityId;
+
+    private Integer channelId;
+
+    private Integer serverTypeId;
+
+    private Integer rankId;
+
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date createTime;
+
+    // 套餐id
+    private Integer  estimatedId;
+
+    //夜间服务id
+    private Integer  nightId;
+
+
+    private BigDecimal mealPrice;
+
+    private BigDecimal basicsPrice;
+
+    private Integer kilometres;
+
+
+
+    private Integer serverTime;
+
+    private Integer nightServerTime;
+
+
+
+    private BigDecimal mileagePrice;
+
+    private BigDecimal timePrice;
+
+    private Double longWayMileage;
+
+    private BigDecimal longWayPrice;
+
+    private BigDecimal nightServerMileagePrice;
+
+    private BigDecimal nightServerTimePrice;
+
+
+    private BigDecimal kilometrePrice;
+
+
+    private Integer startTime;
+
+    private Integer endTime;
+
+
+    // 分段计费规则List集合
+    private List<Section> sectionList;
+}

car-charging/car-charging-common/src/main/java/com/car/charging/common/domain/req/ChargingMiddleTableReq.java

@@ -0,0 +1,50 @@
+package com.car.charging.common.domain.req;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @ClassName ChargingMiddleTableReq
+ * @Description 描述
+ * @Author Di.Wu
+ * @Date 2024/2/26 14:40
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class ChargingMiddleTableReq {
+
+    private Integer pageNum =1;
+
+    private Integer pageSize =3;
+
+    /**
+     * 城市id
+     */
+    private Integer cityId;
+    /**
+     * 渠道id
+     */
+    private Integer channelId;
+    /**
+     * 服务类型id
+     */
+    private Integer serverTypeId;
+    /**
+     * 所属级别id
+     */
+    private Integer rankId;
+
+
+    /**
+     * 状态
+     */
+    private Integer availableState;
+
+
+
+
+
+
+}

car-charging/car-charging-common/src/main/java/com/car/charging/common/domain/req/charginListAdd.java

@@ -0,0 +1,39 @@
+package com.car.charging.common.domain.req;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @ClassName charginListAdd
+ * @Description 描述
+ * @Author Di.Wu
+ * @Date 2024/2/28 9:44
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class charginListAdd {
+
+    /**
+     * 城市id
+     */
+    private Integer cityId;
+    /**
+     * 渠道id
+     */
+    private Integer channelId;
+    /**
+     * 服务类型id
+     */
+    private Integer serverTypeId;
+    /**
+     * 所属级别id
+     */
+    private Integer rankId;
+
+
+
+
+
+}

car-charging/car-charging-common/src/main/java/com/car/charging/common/domain/serverType.java

@@ -0,0 +1,34 @@
+package com.car.charging.common.domain;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+
+/**
+ * @ClassName serverType
+ * @Description 描述
+ * @Author Di.Wu
+ * @Date 2024/2/26 9:47
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class serverType {
+
+
+    private Integer serverTypeId;
+    private String typeName;
+    private Date createTime;
+    private Integer createUser;
+    private Date updTime;
+    private Integer updUser;
+    private Integer isDel;
+
+
+
+
+
+
+}

car-charging/car-charging-common/src/main/java/com/car/charging/common/domain/vo/ChargingMiddleTableVo.java

@@ -0,0 +1,57 @@
+package com.car.charging.common.domain.vo;
+
+import com.car.charging.common.domain.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @ClassName ChargingMiddleTableVo
+ * @Description 描述
+ * @Author Di.Wu
+ * @Date 2024/2/26 14:37
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class ChargingMiddleTableVo {
+
+
+    private Integer id;
+    private Integer cityId;
+    private Integer channelId;
+    private Integer serverTypeId;
+    private Integer rankId;
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date updateTime;
+    private String userName;
+    private Integer availableState;
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date createTime;
+
+    private Channel channel;
+
+    private City city;
+
+    private Rank rank;
+
+    private serverType type;
+
+    private EstimatedOrder estimatedOrder;
+
+    private NightServer nightServer;
+
+    private Section section;
+
+
+
+
+
+}

car-charging/car-charging-common/src/main/java/com/car/charging/common/result/PageResult.java

@@ -0,0 +1,35 @@
+package com.car.charging.common.result;
+
+import com.boot.common.core.domain.Result;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author DongZl
+ * @description: 列表返回结果集
+ */
+@Data
+public class PageResult<T> implements Serializable {
+    /**
+     * 总条数
+     */
+    private long total;
+    /**
+     * 结果集合
+     */
+    private List<T> list;
+    public PageResult() {
+    }
+    public PageResult(long total, List<T> list) {
+        this.total = total;
+        this.list = list;
+    }
+    public static <T> PageResult<T> toPageResult(long total, List<T> list){
+        return new PageResult(total , list);
+    }
+    public static <T> Result<PageResult<T>> toResult(long total, List<T> list){
+        return Result.ok(PageResult.toPageResult(total,list));
+    }
+}

car-charging/car-charging-remote/pom.xml

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>com.bawei</groupId>
+		<artifactId>car-charging</artifactId>
+		<version>3.6.3</version>
+	</parent>
+
+	<artifactId>car-charging-remote</artifactId>
+
+	<properties>
+		<maven.compiler.source>17</maven.compiler.source>
+		<maven.compiler.target>17</maven.compiler.target>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+	</properties>
+
+
+	<dependencies>
+		<dependency>
+			<groupId>com.bawei</groupId>
+			<artifactId>car-charging-common</artifactId>
+			<version>3.6.3</version>
+		</dependency>
+	</dependencies>
+
+
+</project>

car-charging/car-charging-server/pom.xml

@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>com.bawei</groupId>
+		<artifactId>car-charging</artifactId>
+		<version>3.6.3</version>
+	</parent>
+
+	<artifactId>car-charging-server</artifactId>
+
+	<properties>
+		<maven.compiler.source>17</maven.compiler.source>
+		<maven.compiler.target>17</maven.compiler.target>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+	</properties>
+
+	<dependencies>
+
+		<!-- SpringCloud Alibaba Nacos -->
+		<dependency>
+			<groupId>com.alibaba.cloud</groupId>
+			<artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
+		</dependency>
+
+		<!-- SpringCloud Alibaba Nacos Config -->
+		<dependency>
+			<groupId>com.alibaba.cloud</groupId>
+			<artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
+		</dependency>
+
+		<!-- SpringCloud Alibaba Sentinel -->
+		<dependency>
+			<groupId>com.alibaba.cloud</groupId>
+			<artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
+		</dependency>
+
+		<!-- SpringBoot Actuator -->
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-actuator</artifactId>
+		</dependency>
+
+		<!-- Swagger UI -->
+		<dependency>
+			<groupId>io.springfox</groupId>
+			<artifactId>springfox-swagger-ui</artifactId>
+			<version>${swagger.fox.version}</version>
+		</dependency>
+
+		<!-- Mysql Connector -->
+		<dependency>
+			<groupId>com.mysql</groupId>
+			<artifactId>mysql-connector-j</artifactId>
+		</dependency>
+
+		<!-- RuoYi Common DataSource -->
+		<dependency>
+			<groupId>com.boot</groupId>
+			<artifactId>boot-common-datasource</artifactId>
+		</dependency>
+
+		<!-- RuoYi Common DataScope -->
+		<dependency>
+			<groupId>com.boot</groupId>
+			<artifactId>boot-common-datascope</artifactId>
+		</dependency>
+
+		<!-- RuoYi Common Log -->
+		<dependency>
+			<groupId>com.boot</groupId>
+			<artifactId>boot-common-log</artifactId>
+		</dependency>
+
+		<!-- RuoYi Common Swagger -->
+		<dependency>
+			<groupId>com.boot</groupId>
+			<artifactId>boot-common-swagger</artifactId>
+		</dependency>
+
+		<!--        系统服务的公共依赖-->
+		<dependency>
+			<groupId>com.boot</groupId>
+			<artifactId>boot-system-common</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>com.boot</groupId>
+			<artifactId>boot-file-remote</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>com.bawei</groupId>
+			<artifactId>car-charging-common</artifactId>
+			<version>3.6.3</version>
+		</dependency>
+
+	</dependencies>
+
+	<build>
+		<finalName>${project.artifactId}</finalName>
+		<plugins>
+			<plugin>
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-maven-plugin</artifactId>
+				<executions>
+					<execution>
+						<goals>
+							<goal>repackage</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+
+
+
+</project>

car-charging/car-charging-server/src/main/java/com/car/charging/CarChargingApplication.java

@@ -0,0 +1,36 @@
+package com.car.charging;
+
+import com.boot.common.security.annotation.EnableCustomConfig;
+import com.boot.common.security.annotation.EnableRyFeignClients;
+import com.boot.common.swagger.annotation.EnableCustomSwagger2;
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+/**
+ * 系统模块
+ *
+ * @author boot
+ */
+@EnableCustomConfig
+@EnableCustomSwagger2
+@EnableRyFeignClients
+@SpringBootApplication
+@MapperScan("com.car.charging.mapper")
+public class CarChargingApplication
+{
+    public static void main(String[] args)
+    {
+        SpringApplication.run(CarChargingApplication.class, args);
+        System.out.println("~~|~~~  计费模块启动成功   ~~~|~~\n" +
+                " ---------          ---------\n" +
+                "    |||                 ||| \n" +
+                "                             \n" +
+                "              | |                   \n" +
+                "            (_ o _)          \n" +
+                "        |||||||||||||||                \n" +
+                "    ~~~~~~~~~~~~~~~~~~~~~~~                                   \n" +
+                "     \n" +
+                "     ");
+    }
+}

car-charging/car-charging-server/src/main/java/com/car/charging/controller/CharginController.java

@@ -0,0 +1,101 @@
+package com.car.charging.controller;
+
+import com.boot.common.core.domain.Result;
+
+import com.car.charging.common.domain.*;
+import com.car.charging.common.domain.req.AddChannel;
+import com.car.charging.common.domain.req.ChargingMiddleTableReq;
+import com.car.charging.common.domain.vo.ChargingMiddleTableVo;
+import com.car.charging.common.result.PageResult;
+import com.car.charging.service.ChargingService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.car.charging.common.domain.Channel;
+import java.util.List;
+
+/**
+ * @ClassName CharginController
+ * @Description 描述
+ * @Author Di.Wu
+ * @Date 2024/2/26 14:33
+ */
+@RestController
+public class CharginController {
+
+
+    @Autowired
+    private ChargingService charginService;
+
+    /*
+     *计费列表
+     */
+    @PostMapping("/charginList")
+    public Result<PageResult<ChargingMiddleTableVo>> charginList(@RequestBody ChargingMiddleTableReq req){
+
+        Result<PageResult<ChargingMiddleTableVo>> result = charginService.list(req);
+
+        return result;
+
+    }
+
+    @PostMapping("/AddChannel")
+    public Result AddChannel(@RequestBody AddChannel addChannel){
+
+       return Result.ok(charginService.addCharging(addChannel));
+    }
+
+    @PostMapping("/updChannel")
+    public Result updChannel(@RequestBody AddChannel addChannel){
+        return Result.ok(charginService.updCharging(addChannel));
+    }
+
+
+
+
+    @PostMapping("/ChannelList")
+    public Result<List<Channel>> ChannelList(){
+
+//        List<Channel> result = charginService.ChannelList();
+
+        List<Channel> result = charginService.ChannelList();
+
+        return Result.ok(result);
+    }
+
+    @PostMapping("/CityList")
+    public Result<List<City>> CityList(){
+        List<City> result = charginService.CityList();
+
+        return Result.ok(result);
+    }
+
+    @PostMapping("/RankList")
+    public Result<List<Rank>> RankList(){
+        List<Rank> result = charginService.RankList();
+
+        return Result.ok(result);
+    }
+
+    @PostMapping("/serverTypeList")
+    public Result<List<serverType>> serverTypeList(){
+        List<serverType> result = charginService.serverTypeList();
+
+        return Result.ok(result);
+    }
+
+
+
+
+
+
+
+
+
+
+
+
+}

car-charging/car-charging-server/src/main/java/com/car/charging/mapper/ChargingMapper.java

@@ -0,0 +1,49 @@
+package com.car.charging.mapper;
+
+import com.car.charging.common.domain.*;
+import com.car.charging.common.domain.req.AddChannel;
+import com.car.charging.common.domain.req.ChargingMiddleTableReq;
+import com.car.charging.common.domain.vo.ChargingMiddleTableVo;
+import com.car.charging.common.domain.Section;
+import java.util.List;
+
+/**
+ * @ClassName ChargingMapper
+ * @Description 描述
+ * @Author Di.Wu
+ * @Date 2024/2/26 14:14
+ */
+
+public interface ChargingMapper {
+
+
+    List<ChargingMiddleTableVo> list(ChargingMiddleTableReq res);
+
+    List<Channel> ChannelList();
+
+    List<City> CityList();
+
+    List<Rank> RankList();
+
+    List<serverType> serverTypeList();
+
+
+
+
+    void   addChargingMiddleTable(ChargingMiddleTable chargingMiddleTable );
+
+    void addNightServer(NightServer nightServer);
+
+    void addEstimatedOrder(EstimatedOrder eniteration);
+
+
+    void addSection(Section section1);
+
+    void updNightServer(AddChannel addChannel);
+
+    void updEstimatedOrder(AddChannel addChannel);
+
+    void updSection(AddChannel addChannel);
+
+    void updChargingMiddleTable(AddChannel addChannel);
+}

car-charging/car-charging-server/src/main/java/com/car/charging/service/ChargingService.java

@@ -0,0 +1,37 @@
+package com.car.charging.service;
+
+import com.boot.common.core.domain.Result;
+import com.car.charging.common.domain.*;
+import com.car.charging.common.domain.req.AddChannel;
+import com.car.charging.common.domain.req.ChargingMiddleTableReq;
+import com.car.charging.common.domain.vo.ChargingMiddleTableVo;
+import com.car.charging.common.result.PageResult;
+
+import java.util.List;
+
+/**
+ * @ClassName ChargingService
+ * @Description 描述
+ * @Author Di.Wu
+ * @Date 2024/2/26 14:17
+ */
+public interface ChargingService {
+    Result<PageResult<ChargingMiddleTableVo>> list(ChargingMiddleTableReq req);
+
+    List<Channel> ChannelList();
+
+    List<City> CityList();
+
+    List<Rank> RankList();
+
+    List<serverType> serverTypeList();
+
+
+
+
+
+
+    boolean addCharging(AddChannel addChannel);
+
+    boolean updCharging(AddChannel addChannel);
+}

car-charging/car-charging-server/src/main/java/com/car/charging/service/impl/ChargingServiceImpl.java

@@ -0,0 +1,140 @@
+package com.car.charging.service.impl;
+
+import com.boot.common.core.domain.Result;
+import com.car.charging.common.domain.*;
+import com.car.charging.common.domain.req.AddChannel;
+import com.car.charging.common.domain.req.ChargingMiddleTableReq;
+import com.car.charging.common.domain.vo.ChargingMiddleTableVo;
+import com.car.charging.common.result.PageResult;
+
+import com.car.charging.mapper.ChargingMapper;
+import com.car.charging.service.ChargingService;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.PlatformTransactionManager;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @ClassName ChargingServiceImpl
+ * @Description 描述
+ * @Author Di.Wu
+ * @Date 2024/2/26 14:17
+ */
+@Service
+public class ChargingServiceImpl implements ChargingService {
+
+    @Autowired
+    private ChargingMapper mapper;
+
+    @Override
+    public Result<PageResult<ChargingMiddleTableVo>> list(ChargingMiddleTableReq req) {
+
+        PageHelper.startPage(req.getPageNum(), req.getPageSize());
+
+
+        List<ChargingMiddleTableVo> list = mapper.list(req);
+
+        PageInfo<ChargingMiddleTableVo> chargingMiddleTableVoPageInfo = new PageInfo<>(list);
+
+
+        return PageResult.toResult(chargingMiddleTableVoPageInfo.getTotal(), list);
+    }
+
+    @Override
+    public List<Channel> ChannelList() {
+
+        return mapper.ChannelList();
+    }
+
+    @Override
+    public List<City> CityList() {
+        return mapper.CityList();
+    }
+
+    @Override
+    public List<Rank> RankList() {
+        return mapper.RankList();
+    }
+
+    @Override
+    public List<serverType> serverTypeList() {
+        return mapper.serverTypeList();
+    }
+
+
+    //               	需要回滚的异常类
+//  @Transactional( rollbackFor={Exception.class})
+    @Transactional
+    @Override
+    public boolean addCharging(AddChannel addChannel) {
+        String Id = "";
+
+        NightServer nightServer = new NightServer();
+
+        EstimatedOrder estimatedOrder = new EstimatedOrder();
+
+        Section section = new Section();
+
+        ChargingMiddleTable chargingMiddleTable = new ChargingMiddleTable();
+
+
+        if (addChannel.getSectionList() != null) {
+
+            for (Section section1 : addChannel.getSectionList()) {
+                BeanUtils.copyProperties(addChannel,section1 );
+                mapper.addSection(section1);
+                Integer id = section.getId();
+                Id += "," + id;
+            }
+            //分段计费
+            estimatedOrder.setSectionId(Id.substring(1));
+
+        } else {
+            //整段计费
+            estimatedOrder.setSectionId(String.valueOf(0));
+        }
+        //赋值给 nightServer
+        BeanUtils.copyProperties(addChannel, nightServer);
+
+        mapper.addNightServer(nightServer);
+        //赋值给 estimatedOrder
+        BeanUtils.copyProperties(addChannel, estimatedOrder);
+        estimatedOrder.setNightId(nightServer.getId());
+        //赋值给 chargingMiddleTable
+        mapper.addEstimatedOrder(estimatedOrder);
+        BeanUtils.copyProperties(addChannel, chargingMiddleTable);
+        chargingMiddleTable.setEstimatedId(estimatedOrder.getId());
+
+
+        mapper.addChargingMiddleTable(chargingMiddleTable);
+
+
+        return true;
+
+
+    }
+
+    @Transactional
+    @Override
+    public boolean updCharging(AddChannel addChannel) {
+
+
+        mapper.updNightServer(addChannel);
+
+        mapper.updEstimatedOrder(addChannel);
+
+        mapper.updSection(addChannel);
+
+
+        return true;
+    }
+
+
+}

car-charging/car-charging-server/src/main/resources/banner.txt

@@ -0,0 +1,22 @@
+Spring Boot Version: ${spring-boot.version}
+Spring Application Name: ${spring.application.name}
+
+
+
+
+
+   ~~~~~~~~~~~~~~~~~~~           ~~~~~~~~~~~~~~~~~~~}
+                     |           |                   }
+                     |           |                    }
+                     |           |                     }
+                     |           |                    }
+                     |           |                   }
+                     |           |                  }
+    ~~~~~~~~~~~~~~~~~~           |~~~~~~~~~~~~~~~~~ }
+    |                            |                   }
+    |                            |                    }
+    |                            |                     }
+    |                            |                     }
+    |                            |                    }
+    |                            |                   }
+    ~~~~~~~~~~~~~~~~~~~          ~~~~~~~~~~~~~~~~~~~}

car-charging/car-charging-server/src/main/resources/bootstrap.yml

@@ -0,0 +1,27 @@
+# Tomcat
+server:
+  port: 9002
+
+# Spring
+spring:
+  application:
+    # 应用名称
+    name: car-charging
+  profiles:
+    # 环境配置
+    active: dev
+  cloud:
+    nacos:
+      discovery:
+        # 服务注册地址
+        server-addr: 122.152.215.207:8848
+        namespace:  wdwdwd
+      config:
+        # 配置中心地址
+        server-addr: 122.152.215.207:8848
+        # 配置文件格式
+        file-extension: yml
+        # 共享配置
+        shared-configs:
+          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+        namespace: wdwdwd

car-charging/car-charging-server/src/main/resources/mapper/charging/ChargingMapper.xml

@@ -0,0 +1,344 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.car.charging.mapper.ChargingMapper">
+
+<!--	<resultMap type="com.car.charging.common.domain.vo.ChargingMiddleTableVo" id="SysUserRoleResult">-->
+<!--		<result property="userId"     column="user_id"      />-->
+<!--		<result property="roleId"     column="role_id"      />-->
+<!--	</resultMap>-->
+
+
+
+	<resultMap type="com.car.charging.common.domain.vo.ChargingMiddleTableVo" id="ChargingMiddleTableResultMap">
+		<id property="id" column="id"/>
+		<result property="cityId" column="city_id"/>
+		<result property="channelId" column="channel_id"/>
+		<result property="serverTypeId" column="server_type_id"/>
+		<result property="rankId" column="rank_id"/>
+		<result property="updateTime" column="update_time"/>
+		<result property="userName" column="user_name"/>
+		<result property="availableState" column="available_state"/>
+		<result property="createTime" column="create_time"/>
+
+
+<!--		<association property="channel" javaType="com.car.charging.common.domain.Channel">-->
+<!--			<id property="channelId" column="channel_id"/>&ndash;&gt;-->
+<!--			<result property="channelName" column="channel_name"/>-->
+<!--			<result property="createTime" column="create_time"/>-->
+<!--			<result property="createUser" column="create_user"/>-->
+<!--			<result property="updTime" column="upd_time"/>-->
+<!--			<result property="updUser" column="upd_user"/>-->
+<!--			<result property="isDel" column="is_del"/>-->
+<!--		</association>-->
+
+		<association property="channel" javaType="com.car.charging.common.domain.Channel">
+						<id property="channelId" column="channel_id"/>
+						<result property="channelName" column="channel_name"/>
+						<result property="createTime" column="create_time"/>
+						<result property="createUser" column="create_user"/>
+						<result property="updTime" column="upd_time"/>
+						<result property="updUser" column="upd_user"/>
+						<result property="isDel" column="is_del"/>
+		</association>
+
+
+		<association property="city" javaType="com.car.charging.common.domain.City">
+					<id property="cityId" column="city_id"/>
+					<result property="cityName" column="city_name"/>
+		</association>
+
+		<association property="rank" javaType="com.car.charging.common.domain.Rank">
+			<id property="rankId" column="rank_id"/>
+			<result property="rankName" column="rank_name"/>
+			<result property="createTime" column="create_time"/>
+			<result property="createUser" column="create_user"/>
+			<result property="updTime" column="upd_time"/>
+			<result property="updUser" column="upd_user"/>
+			<result property="isDel" column="is_del"/>
+		</association>
+
+		<association property="type" javaType="com.car.charging.common.domain.serverType">
+			<id property="serverTypeId" column="server_type_id"/>
+			<result property="typeName" column="type_name"/>
+			<result property="createTime" column="create_time"/>
+			<result property="createUser" column="create_user"/>
+			<result property="updTime" column="upd_time"/>
+			<result property="updUser" column="upd_user"/>
+			<result property="isDel" column="is_del"/>
+		</association>
+
+		<association property="estimatedOrder" javaType="com.car.charging.common.domain.EstimatedOrder">
+
+			<id property="id" column="id"/>
+			<result property="cityId" column="city_id"/>
+			<result property="serverTypeId" column="server_type_id"/>
+			<result property="channelId" column="channel_id"/>
+			<result property="rankId" column="rank_id"/>
+			<result property="kilometres" column="kilometres"/>
+			<result property="serverTime" column="server_time"/>
+			<result property="mealPrice" column="meal_price"/>
+			<result property="basicsPrice" column="basics_price"/>
+			<result property="nightId" column="night_id"/>
+			<result property="sectionId" column="section_id"/>
+			<result property="createTime" column="create_time"/>
+
+		</association>
+
+		<association property="nightServer" javaType="com.car.charging.common.domain.NightServer">
+			<id property="id" column="id"/>
+			<result property="nightServerMileagePrice" column="night_server_mileage_price"/>
+			<result property="nightServerTimePrice" column="night_server_time_price"/>
+			<result property="mileagePrice" column="mileage_price"/>
+			<result property="timePrice" column="time_price"/>
+			<result property="longWayMileage" column="long_way_mileage"/>
+			<result property="longWayPrice" column="long_way_price"/>
+		</association>
+
+		<association property="section" javaType="com.car.charging.common.domain.Section">
+			<id property="id" column="id"/>
+			<result property="startTime" column="start_time"/>
+			<result property="endTime" column="end_time"/>
+			<result property="kilometrePrice" column="kilometre_price"/>
+			<result property="timePrice" column="time_price"/>
+		</association>
+
+
+
+	</resultMap>
+
+	<resultMap type="com.car.charging.common.domain.Channel" id="ChannelMap">
+					<id property="channelId" column="channel_id"/>
+					<result property="channelName" column="channel_name"/>
+					<result property="createTime" column="create_time"/>
+					<result property="createUser" column="create_user"/>
+					<result property="updTime" column="upd_time"/>
+					<result property="updUser" column="upd_user"/>
+					<result property="isDel" column="is_del"/>
+
+	</resultMap>
+
+	<resultMap type="com.car.charging.common.domain.City" id="CityMap">
+		<id property="cityId" column="city_id"/>
+		<result property="cityName" column="city_name"/>
+
+	</resultMap>
+
+	<resultMap type="com.car.charging.common.domain.Rank" id="RankMap">
+		<id property="rankId" column="rank_id"/>
+		<result property="rankName" column="rank_name"/>
+		<result property="createTime" column="create_time"/>
+		<result property="createUser" column="create_user"/>
+		<result property="updTime" column="upd_time"/>
+		<result property="updUser" column="upd_user"/>
+		<result property="isDel" column="is_del"/>
+	</resultMap>
+
+	<resultMap type="com.car.charging.common.domain.serverType" id="serverTypeMap">
+		<id property="serverTypeId" column="server_type_id"/>
+		<result property="typeName" column="type_name"/>
+		<result property="createTime" column="create_time"/>
+		<result property="createUser" column="create_user"/>
+		<result property="updTime" column="upd_time"/>
+		<result property="updUser" column="upd_user"/>
+		<result property="isDel" column="is_del"/>
+
+	</resultMap>
+
+	<insert id="addChargingMiddleTable" >
+		INSERT INTO
+		    charging_middle_table(
+		     `city_id`,
+			 `channel_id`,
+		     `server_type_id`,
+		     `rank_id`,
+		     `estimated_id`,
+		     `create_time`)
+		     VALUES
+		     ( #{cityId},#{channelId},#{serverTypeId},#{rankId},#{estimatedId},#{createTime});
+	</insert>
+
+	<insert id="addNightServer" keyProperty="id" useGeneratedKeys="true">
+		INSERT INTO
+		    `night_server`
+		    (
+		     `night_server_mileage_price`,
+		     `night_server_time_price`,
+		     `mileage_price`,
+		     `time_price`,
+		     `long_way_mileage`,
+		     `long_way_price`)
+		VALUES
+		    (#{nightServerMileagePrice}, #{nightServerTimePrice}, #{mileagePrice}, #{timePrice}, #{longWayMileage}, #{longWayPrice});
+
+	</insert>
+	<insert id="addEstimatedOrder" keyProperty="id" useGeneratedKeys="true">
+		INSERT INTO `estimated_order`
+		    (
+		     `city_id`,
+		     `server_type_id`,
+		     `channel_id`,
+		     `rank_id`,
+		     `kilometres`,
+		     `server_time`,
+		     `meal_price`,
+		     `basics_price`,
+		     `night_id`)
+		VALUES
+		    (#{cityId}, #{serverTypeId}, #{channelId}, #{rankId},#{kilometres},#{serverTime}, #{mealPrice}, #{basicsPrice}, #{nightId});
+
+	</insert>
+
+	<insert id="addSection" keyProperty="id"  useGeneratedKeys="true"  >
+			INSERT INTO `tb_section`
+			<trim prefix="(" suffix=")" suffixOverrides=",">
+			    `start_time`,
+			    `end_time`,
+				`kilometre_price`,
+				`time_price`
+			</trim>
+			VALUES
+			<trim prefix="(" suffix=")" suffixOverrides=",">
+			    #{startTime},
+			    #{endTime},
+				#{kilometrePrice},
+				#{timePrice}
+			</trim>
+	</insert>
+
+	<update id="updNightServer">
+		UPDATE
+		    `night_server`
+		SET
+		     `night_server_mileage_price` = #{nightServerMileagePrice},
+		     `night_server_time_price` = #{nightServerTimePrice},
+		     `mileage_price` = #{mealPrice},
+		     `time_price` = #{timePrice},
+		     `long_way_mileage` = #{longWayMileage},
+		     `long_way_price` = #{longWayPrice}
+		WHERE
+		    `id` = #{id};
+
+	</update>
+
+	<update id="updEstimatedOrder">
+		UPDATE `estimated_order`
+		SET
+		    `kilometres` = #{kilometres},
+		    `server_time` = #{serverTime},
+		    `meal_price` = #{mealPrice},
+		    `basics_price` = #{basicsPrice},
+		WHERE `id` = #{id};
+
+	</update>
+
+	<update id="updSection">
+		UPDATE `tb_section`
+		SET `start_time` = #{startTime},
+		    `end_time` = #{endTime},
+		    `kilometre_price` = #{kilometrePrice},
+		    `time_price` = #{timePrice}
+		WHERE `id` = #{id};
+
+	</update>
+
+	<update id="updChargingMiddleTable">
+
+	</update>
+
+
+	<select id="list" resultMap="ChargingMiddleTableResultMap">
+		SELECT t.id,
+		c.city_id,
+		c.city_name,
+		l.channel_id,
+		l.channel_name,
+		st.server_type_id,
+		st.type_name,
+		t.rank_id,
+		r.rank_name,
+		t.update_time,
+		t.user_name,
+		t.create_time,
+		t.available_state,
+		eo.kilometres,
+		eo.server_time,
+		eo.meal_price,
+		eo.basics_price,
+		ns.night_server_mileage_price,
+		ns.night_server_time_price,
+		ns.mileage_price,
+		ns.time_price,
+		ns.long_way_mileage,
+		ns.long_way_price,
+		ts.kilometre_price,
+		ts.start_time,
+		ts.end_time,
+		ts.time_price
+		FROM charging_middle_table t
+		LEFT JOIN city c ON t.city_id = c.city_id
+		LEFT JOIN channel l ON t.channel_id = l.channel_id
+		LEFT JOIN server_type st ON t.server_type_id = st.server_type_id
+		LEFT JOIN t_rank r ON t.rank_id = r.rank_id
+		LEFT JOIN estimated_order eo ON t.estimated_id = eo.id
+		LEFT JOIN night_server ns on eo.night_id = ns.id
+		LEFT JOIN tb_section ts on eo.section_id = ts.id
+
+		<where>
+
+			<if test="cityId!=null">
+				and  c.city_id =  #{cityId}
+			</if>
+
+			<if test="channelId!=null">
+				and  l.channel_id =  #{channelId}
+			</if>
+
+			<if test="serverTypeId!=null">
+				and  st.server_type_id =  #{serverTypeId}
+			</if>
+
+			<if test="rankId!=null">
+				and  t.rank_id =  #{rankId}
+			</if>
+
+			<if test="availableState!=null">
+				and t.available_state = #{availableState}
+			</if>
+
+		</where>
+
+
+	</select>
+
+	<select id="ChannelList" resultMap="ChannelMap">
+			select * from channel
+	</select>
+
+	<select id="CityList" resultMap="CityMap">
+			select * from city
+	</select>
+
+	<select id="RankList" resultMap="RankMap">
+			select * from t_rank
+	</select>
+
+	<select id="serverTypeList" resultMap="serverTypeMap">
+			select * from server_type
+	</select>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+</mapper>

car-charging/car-charging-server/target/classes/banner.txt

@@ -0,0 +1,22 @@
+Spring Boot Version: ${spring-boot.version}
+Spring Application Name: ${spring.application.name}
+
+
+
+
+
+   ~~~~~~~~~~~~~~~~~~~           ~~~~~~~~~~~~~~~~~~~}
+                     |           |                   }
+                     |           |                    }
+                     |           |                     }
+                     |           |                    }
+                     |           |                   }
+                     |           |                  }
+    ~~~~~~~~~~~~~~~~~~           |~~~~~~~~~~~~~~~~~ }
+    |                            |                   }
+    |                            |                    }
+    |                            |                     }
+    |                            |                     }
+    |                            |                    }
+    |                            |                   }
+    ~~~~~~~~~~~~~~~~~~~          ~~~~~~~~~~~~~~~~~~~}

car-charging/car-charging-server/target/classes/bootstrap.yml

@@ -0,0 +1,27 @@
+# Tomcat
+server:
+  port: 9002
+
+# Spring
+spring:
+  application:
+    # 应用名称
+    name: car-charging
+  profiles:
+    # 环境配置
+    active: dev
+  cloud:
+    nacos:
+      discovery:
+        # 服务注册地址
+        server-addr: 122.152.215.207:8848
+        namespace:  wdwdwd
+      config:
+        # 配置中心地址
+        server-addr: 122.152.215.207:8848
+        # 配置文件格式
+        file-extension: yml
+        # 共享配置
+        shared-configs:
+          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+        namespace: wdwdwd

car-charging/car-charging-server/target/classes/mapper/charging/ChargingMapper.xml

@@ -0,0 +1,344 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.car.charging.mapper.ChargingMapper">
+
+<!--	<resultMap type="com.car.charging.common.domain.vo.ChargingMiddleTableVo" id="SysUserRoleResult">-->
+<!--		<result property="userId"     column="user_id"      />-->
+<!--		<result property="roleId"     column="role_id"      />-->
+<!--	</resultMap>-->
+
+
+
+	<resultMap type="com.car.charging.common.domain.vo.ChargingMiddleTableVo" id="ChargingMiddleTableResultMap">
+		<id property="id" column="id"/>
+		<result property="cityId" column="city_id"/>
+		<result property="channelId" column="channel_id"/>
+		<result property="serverTypeId" column="server_type_id"/>
+		<result property="rankId" column="rank_id"/>
+		<result property="updateTime" column="update_time"/>
+		<result property="userName" column="user_name"/>
+		<result property="availableState" column="available_state"/>
+		<result property="createTime" column="create_time"/>
+
+
+<!--		<association property="channel" javaType="com.car.charging.common.domain.Channel">-->
+<!--			<id property="channelId" column="channel_id"/>&ndash;&gt;-->
+<!--			<result property="channelName" column="channel_name"/>-->
+<!--			<result property="createTime" column="create_time"/>-->
+<!--			<result property="createUser" column="create_user"/>-->
+<!--			<result property="updTime" column="upd_time"/>-->
+<!--			<result property="updUser" column="upd_user"/>-->
+<!--			<result property="isDel" column="is_del"/>-->
+<!--		</association>-->
+
+		<association property="channel" javaType="com.car.charging.common.domain.Channel">
+						<id property="channelId" column="channel_id"/>
+						<result property="channelName" column="channel_name"/>
+						<result property="createTime" column="create_time"/>
+						<result property="createUser" column="create_user"/>
+						<result property="updTime" column="upd_time"/>
+						<result property="updUser" column="upd_user"/>
+						<result property="isDel" column="is_del"/>
+		</association>
+
+
+		<association property="city" javaType="com.car.charging.common.domain.City">
+					<id property="cityId" column="city_id"/>
+					<result property="cityName" column="city_name"/>
+		</association>
+
+		<association property="rank" javaType="com.car.charging.common.domain.Rank">
+			<id property="rankId" column="rank_id"/>
+			<result property="rankName" column="rank_name"/>
+			<result property="createTime" column="create_time"/>
+			<result property="createUser" column="create_user"/>
+			<result property="updTime" column="upd_time"/>
+			<result property="updUser" column="upd_user"/>
+			<result property="isDel" column="is_del"/>
+		</association>
+
+		<association property="type" javaType="com.car.charging.common.domain.serverType">
+			<id property="serverTypeId" column="server_type_id"/>
+			<result property="typeName" column="type_name"/>
+			<result property="createTime" column="create_time"/>
+			<result property="createUser" column="create_user"/>
+			<result property="updTime" column="upd_time"/>
+			<result property="updUser" column="upd_user"/>
+			<result property="isDel" column="is_del"/>
+		</association>
+
+		<association property="estimatedOrder" javaType="com.car.charging.common.domain.EstimatedOrder">
+
+			<id property="id" column="id"/>
+			<result property="cityId" column="city_id"/>
+			<result property="serverTypeId" column="server_type_id"/>
+			<result property="channelId" column="channel_id"/>
+			<result property="rankId" column="rank_id"/>
+			<result property="kilometres" column="kilometres"/>
+			<result property="serverTime" column="server_time"/>
+			<result property="mealPrice" column="meal_price"/>
+			<result property="basicsPrice" column="basics_price"/>
+			<result property="nightId" column="night_id"/>
+			<result property="sectionId" column="section_id"/>
+			<result property="createTime" column="create_time"/>
+
+		</association>
+
+		<association property="nightServer" javaType="com.car.charging.common.domain.NightServer">
+			<id property="id" column="id"/>
+			<result property="nightServerMileagePrice" column="night_server_mileage_price"/>
+			<result property="nightServerTimePrice" column="night_server_time_price"/>
+			<result property="mileagePrice" column="mileage_price"/>
+			<result property="timePrice" column="time_price"/>
+			<result property="longWayMileage" column="long_way_mileage"/>
+			<result property="longWayPrice" column="long_way_price"/>
+		</association>
+
+		<association property="section" javaType="com.car.charging.common.domain.Section">
+			<id property="id" column="id"/>
+			<result property="startTime" column="start_time"/>
+			<result property="endTime" column="end_time"/>
+			<result property="kilometrePrice" column="kilometre_price"/>
+			<result property="timePrice" column="time_price"/>
+		</association>
+
+
+
+	</resultMap>
+
+	<resultMap type="com.car.charging.common.domain.Channel" id="ChannelMap">
+					<id property="channelId" column="channel_id"/>
+					<result property="channelName" column="channel_name"/>
+					<result property="createTime" column="create_time"/>
+					<result property="createUser" column="create_user"/>
+					<result property="updTime" column="upd_time"/>
+					<result property="updUser" column="upd_user"/>
+					<result property="isDel" column="is_del"/>
+
+	</resultMap>
+
+	<resultMap type="com.car.charging.common.domain.City" id="CityMap">
+		<id property="cityId" column="city_id"/>
+		<result property="cityName" column="city_name"/>
+
+	</resultMap>
+
+	<resultMap type="com.car.charging.common.domain.Rank" id="RankMap">
+		<id property="rankId" column="rank_id"/>
+		<result property="rankName" column="rank_name"/>
+		<result property="createTime" column="create_time"/>
+		<result property="createUser" column="create_user"/>
+		<result property="updTime" column="upd_time"/>
+		<result property="updUser" column="upd_user"/>
+		<result property="isDel" column="is_del"/>
+	</resultMap>
+
+	<resultMap type="com.car.charging.common.domain.serverType" id="serverTypeMap">
+		<id property="serverTypeId" column="server_type_id"/>
+		<result property="typeName" column="type_name"/>
+		<result property="createTime" column="create_time"/>
+		<result property="createUser" column="create_user"/>
+		<result property="updTime" column="upd_time"/>
+		<result property="updUser" column="upd_user"/>
+		<result property="isDel" column="is_del"/>
+
+	</resultMap>
+
+	<insert id="addChargingMiddleTable" >
+		INSERT INTO
+		    charging_middle_table(
+		     `city_id`,
+			 `channel_id`,
+		     `server_type_id`,
+		     `rank_id`,
+		     `estimated_id`,
+		     `create_time`)
+		     VALUES
+		     ( #{cityId},#{channelId},#{serverTypeId},#{rankId},#{estimatedId},#{createTime});
+	</insert>
+
+	<insert id="addNightServer" keyProperty="id" useGeneratedKeys="true">
+		INSERT INTO
+		    `night_server`
+		    (
+		     `night_server_mileage_price`,
+		     `night_server_time_price`,
+		     `mileage_price`,
+		     `time_price`,
+		     `long_way_mileage`,
+		     `long_way_price`)
+		VALUES
+		    (#{nightServerMileagePrice}, #{nightServerTimePrice}, #{mileagePrice}, #{timePrice}, #{longWayMileage}, #{longWayPrice});
+
+	</insert>
+	<insert id="addEstimatedOrder" keyProperty="id" useGeneratedKeys="true">
+		INSERT INTO `estimated_order`
+		    (
+		     `city_id`,
+		     `server_type_id`,
+		     `channel_id`,
+		     `rank_id`,
+		     `kilometres`,
+		     `server_time`,
+		     `meal_price`,
+		     `basics_price`,
+		     `night_id`)
+		VALUES
+		    (#{cityId}, #{serverTypeId}, #{channelId}, #{rankId},#{kilometres},#{serverTime}, #{mealPrice}, #{basicsPrice}, #{nightId});
+
+	</insert>
+
+	<insert id="addSection" keyProperty="id"  useGeneratedKeys="true"  >
+			INSERT INTO `tb_section`
+			<trim prefix="(" suffix=")" suffixOverrides=",">
+			    `start_time`,
+			    `end_time`,
+				`kilometre_price`,
+				`time_price`
+			</trim>
+			VALUES
+			<trim prefix="(" suffix=")" suffixOverrides=",">
+			    #{startTime},
+			    #{endTime},
+				#{kilometrePrice},
+				#{timePrice}
+			</trim>
+	</insert>
+
+	<update id="updNightServer">
+		UPDATE
+		    `night_server`
+		SET
+		     `night_server_mileage_price` = #{nightServerMileagePrice},
+		     `night_server_time_price` = #{nightServerTimePrice},
+		     `mileage_price` = #{mealPrice},
+		     `time_price` = #{timePrice},
+		     `long_way_mileage` = #{longWayMileage},
+		     `long_way_price` = #{longWayPrice}
+		WHERE
+		    `id` = #{id};
+
+	</update>
+
+	<update id="updEstimatedOrder">
+		UPDATE `estimated_order`
+		SET
+		    `kilometres` = #{kilometres},
+		    `server_time` = #{serverTime},
+		    `meal_price` = #{mealPrice},
+		    `basics_price` = #{basicsPrice},
+		WHERE `id` = #{id};
+
+	</update>
+
+	<update id="updSection">
+		UPDATE `tb_section`
+		SET `start_time` = #{startTime},
+		    `end_time` = #{endTime},
+		    `kilometre_price` = #{kilometrePrice},
+		    `time_price` = #{timePrice}
+		WHERE `id` = #{id};
+
+	</update>
+
+	<update id="updChargingMiddleTable">
+
+	</update>
+
+
+	<select id="list" resultMap="ChargingMiddleTableResultMap">
+		SELECT t.id,
+		c.city_id,
+		c.city_name,
+		l.channel_id,
+		l.channel_name,
+		st.server_type_id,
+		st.type_name,
+		t.rank_id,
+		r.rank_name,
+		t.update_time,
+		t.user_name,
+		t.create_time,
+		t.available_state,
+		eo.kilometres,
+		eo.server_time,
+		eo.meal_price,
+		eo.basics_price,
+		ns.night_server_mileage_price,
+		ns.night_server_time_price,
+		ns.mileage_price,
+		ns.time_price,
+		ns.long_way_mileage,
+		ns.long_way_price,
+		ts.kilometre_price,
+		ts.start_time,
+		ts.end_time,
+		ts.time_price
+		FROM charging_middle_table t
+		LEFT JOIN city c ON t.city_id = c.city_id
+		LEFT JOIN channel l ON t.channel_id = l.channel_id
+		LEFT JOIN server_type st ON t.server_type_id = st.server_type_id
+		LEFT JOIN t_rank r ON t.rank_id = r.rank_id
+		LEFT JOIN estimated_order eo ON t.estimated_id = eo.id
+		LEFT JOIN night_server ns on eo.night_id = ns.id
+		LEFT JOIN tb_section ts on eo.section_id = ts.id
+
+		<where>
+
+			<if test="cityId!=null">
+				and  c.city_id =  #{cityId}
+			</if>
+
+			<if test="channelId!=null">
+				and  l.channel_id =  #{channelId}
+			</if>
+
+			<if test="serverTypeId!=null">
+				and  st.server_type_id =  #{serverTypeId}
+			</if>
+
+			<if test="rankId!=null">
+				and  t.rank_id =  #{rankId}
+			</if>
+
+			<if test="availableState!=null">
+				and t.available_state = #{availableState}
+			</if>
+
+		</where>
+
+
+	</select>
+
+	<select id="ChannelList" resultMap="ChannelMap">
+			select * from channel
+	</select>
+
+	<select id="CityList" resultMap="CityMap">
+			select * from city
+	</select>
+
+	<select id="RankList" resultMap="RankMap">
+			select * from t_rank
+	</select>
+
+	<select id="serverTypeList" resultMap="serverTypeMap">
+			select * from server_type
+	</select>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+</mapper>

car-charging/pom.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>com.boot</groupId>
+		<artifactId>boot</artifactId>
+		<version>3.6.3</version>
+	</parent>
+
+	<groupId>com.bawei</groupId>
+	<artifactId>car-charging</artifactId>
+	<packaging>pom</packaging>
+	<modules>
+		<module>car-charging-common</module>
+		<module>car-charging-remote</module>
+		<module>car-charging-server</module>
+	</modules>
+
+	<properties>
+		<maven.compiler.source>17</maven.compiler.source>
+		<maven.compiler.target>17</maven.compiler.target>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+	</properties>
+
+</project>

car-pay/car-pay-common/pom.xml

@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>com.bawei</groupId>
+		<artifactId>car-pay</artifactId>
+		<version>3.6.3</version>
+	</parent>
+
+	<artifactId>car-pay-common</artifactId>
+
+	<properties>
+		<maven.compiler.source>17</maven.compiler.source>
+		<maven.compiler.target>17</maven.compiler.target>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+	</properties>
+
+
+	<dependencies>
+
+		<dependency>
+			<groupId>com.alipay.sdk</groupId>
+			<artifactId>alipay-sdk-java</artifactId>
+			<version>4.9.5.ALL</version>
+		</dependency>
+
+		<dependency>
+			<groupId>com.alipay.sdk</groupId>
+			<artifactId>alipay-easysdk</artifactId>
+			<version>2.2.0</version>
+		</dependency>
+
+
+		<dependency>
+			<groupId>cn.hutool</groupId>
+			<artifactId>hutool-all</artifactId>
+			<version>5.8.3</version>
+		</dependency>
+
+		<!--        系统服务 公共依赖-->
+		<dependency>
+			<groupId>com.boot</groupId>
+			<artifactId>boot-common-core</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.projectlombok</groupId>
+			<artifactId>lombok</artifactId>
+		</dependency>
+	</dependencies>
+
+
+</project>

car-pay/car-pay-common/src/main/java/com/pay/common/AlipayConfig.java

@@ -0,0 +1,58 @@
+package com.pay.common;
+
+import com.alipay.easysdk.factory.Factory;
+import com.alipay.easysdk.kernel.Config;
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+
+import javax.annotation.PostConstruct;
+
+/**
+ * @ClassName 支付配置类
+ * @Description 里面的类要可以一一对应配置信息会从application.yml中读取
+ * @Author Di.Wu
+ * @Date 2024/3/5 20:33
+ */
+@Data
+@Component
+@ConfigurationProperties(prefix = "alipay")
+public class AlipayConfig {
+
+    private String appId;
+
+    private String appPrivateKey;
+
+    private String alipayPublicKey;
+
+    private String notifyUrl;
+
+    private String returnUrl;
+
+
+
+    @PostConstruct
+    public void init(){
+        //设置参数(全局只用设置一次)
+        Config config = new Config();
+        config.protocol="https";
+        config.gatewayHost ="openapi.alipaydev.com";
+        config.signType="RSA2";
+        config.appId = this.appId;
+        config.merchantPrivateKey = this.appPrivateKey;
+        config.alipayPublicKey=this.alipayPublicKey;
+        config.notifyUrl=this.notifyUrl;
+        Factory.setOptions(config);
+        System.out.println("----------支付配置类初始化成功----------" +
+                              ".." +                      ".." +
+
+                                              "||" +
+                               "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" +
+                               "++++++++++++++++++++++++++++++++");
+
+    }
+
+
+
+}

car-pay/car-pay-common/src/main/java/com/pay/common/CustomerOrder.java

@@ -0,0 +1,27 @@
+package com.pay.common;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+
+/**
+ * @ClassName CustomerOrder
+ * @Description 描述
+ * @Author Di.Wu
+ * @Date 2024/3/5 22:16
+ */
+@Data
+public class CustomerOrder {
+   private Integer id;
+
+   private String orderId;
+
+   private Integer payStatus;
+
+   private String orderSubject;
+
+   private String orderPrice;
+
+
+}

car-pay/car-pay-common/src/main/java/com/pay/common/Demo.java

@@ -0,0 +1,46 @@
+package com.pay.common;
+
+import java.util.StringJoiner;
+
+/**
+ * @ClassName Demo
+ * @Description 描述
+ * @Author Di.Wu
+ * @Date 2024/3/5 20:58
+ */
+public class Demo extends Thread{
+    @Override
+    public void run() {
+        System.out.println("Demo");
+    }
+
+    public static void main(String[] args) {
+
+
+        Demo demo = new Demo();
+
+        demo.start();
+
+
+        //{123,456,789}
+        StringJoiner sj = new StringJoiner(",","{", "}");
+        sj.add("123");
+        sj.add("456");
+        sj.add("789");
+        System.out.println(sj);
+        System.out.println("运行结束");
+    }
+
+
+
+
+
+
+
+
+
+
+
+
+
+}

car-pay/car-pay-remote/pom.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>com.bawei</groupId>
+		<artifactId>car-pay</artifactId>
+		<version>3.6.3</version>
+	</parent>
+
+	<artifactId>car-pay-remote</artifactId>
+
+	<properties>
+		<maven.compiler.source>17</maven.compiler.source>
+		<maven.compiler.target>17</maven.compiler.target>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+	</properties>
+
+</project>

car-pay/car-pay-server/pom.xml

@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>com.bawei</groupId>
+		<artifactId>car-pay</artifactId>
+		<version>3.6.3</version>
+	</parent>
+
+	<artifactId>car-pay-server</artifactId>
+
+	<properties>
+		<maven.compiler.source>17</maven.compiler.source>
+		<maven.compiler.target>17</maven.compiler.target>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+	</properties>
+
+	<dependencies>
+
+		<!-- SpringCloud Alibaba Nacos -->
+		<dependency>
+			<groupId>com.alibaba.cloud</groupId>
+			<artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
+		</dependency>
+
+		<!-- SpringCloud Alibaba Nacos Config -->
+		<dependency>
+			<groupId>com.alibaba.cloud</groupId>
+			<artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
+		</dependency>
+
+		<!-- SpringCloud Alibaba Sentinel -->
+		<dependency>
+			<groupId>com.alibaba.cloud</groupId>
+			<artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
+		</dependency>
+
+		<!-- SpringBoot Actuator -->
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-actuator</artifactId>
+		</dependency>
+
+		<!-- Swagger UI -->
+		<dependency>
+			<groupId>io.springfox</groupId>
+			<artifactId>springfox-swagger-ui</artifactId>
+			<version>${swagger.fox.version}</version>
+		</dependency>
+
+		<!-- Mysql Connector -->
+		<dependency>
+			<groupId>com.mysql</groupId>
+			<artifactId>mysql-connector-j</artifactId>
+		</dependency>
+
+		<!-- RuoYi Common DataSource -->
+		<dependency>
+			<groupId>com.boot</groupId>
+			<artifactId>boot-common-datasource</artifactId>
+		</dependency>
+
+		<!-- RuoYi Common DataScope -->
+		<dependency>
+			<groupId>com.boot</groupId>
+			<artifactId>boot-common-datascope</artifactId>
+		</dependency>
+
+		<!-- RuoYi Common Log -->
+		<dependency>
+			<groupId>com.boot</groupId>
+			<artifactId>boot-common-log</artifactId>
+		</dependency>
+
+		<!-- RuoYi Common Swagger -->
+		<dependency>
+			<groupId>com.boot</groupId>
+			<artifactId>boot-common-swagger</artifactId>
+		</dependency>
+
+		<!--        系统服务的公共依赖-->
+		<dependency>
+			<groupId>com.boot</groupId>
+			<artifactId>boot-system-common</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>com.boot</groupId>
+			<artifactId>boot-file-remote</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>com.bawei</groupId>
+			<artifactId>car-charging-common</artifactId>
+			<version>3.6.3</version>
+		</dependency>
+
+
+		<dependency>
+			<groupId>com.alipay.sdk</groupId>
+			<artifactId>alipay-sdk-java</artifactId>
+			<version>4.9.5.ALL</version>
+		</dependency>
+
+		<dependency>
+			<groupId>com.alipay.sdk</groupId>
+			<artifactId>alipay-easysdk</artifactId>
+			<version>2.2.0</version>
+		</dependency>
+
+
+		<dependency>
+			<groupId>cn.hutool</groupId>
+			<artifactId>hutool-all</artifactId>
+			<version>5.8.3</version>
+		</dependency>
+		<dependency>
+			<groupId>com.bawei</groupId>
+			<artifactId>car-pay-common</artifactId>
+			<version>3.6.3</version>
+			<scope>compile</scope>
+		</dependency>
+
+	</dependencies>
+
+	<build>
+		<finalName>${project.artifactId}</finalName>
+		<plugins>
+			<plugin>
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-maven-plugin</artifactId>
+				<executions>
+					<execution>
+						<goals>
+							<goal>repackage</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+
+
+
+
+</project>

car-pay/car-pay-server/src/main/java/com/pay/PayApplication.java

@@ -0,0 +1,36 @@
+package com.pay;
+
+import com.boot.common.security.annotation.EnableCustomConfig;
+import com.boot.common.security.annotation.EnableRyFeignClients;
+import com.boot.common.swagger.annotation.EnableCustomSwagger2;
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+/**
+ * @ClassName PayApplication
+ * @Description 描述
+ * @Author Di.Wu
+ * @Date 2024/3/6 19:53
+ */
+@EnableCustomConfig
+@EnableCustomSwagger2
+@EnableRyFeignClients
+@SpringBootApplication
+@MapperScan("com.pay.mapper")
+public class PayApplication {
+    public static void main(String[] args)
+    {
+        SpringApplication.run(PayApplication.class, args);
+        System.out.println("~~|~~~  支付模块启动成功   ~~~|~~\n" +
+                " ---------          ---------\n" +
+                "    |||                 ||| \n" +
+                "                             \n" +
+                "              | |                   \n" +
+                "            (_ o _)          \n" +
+                "        |||||||||||||||                \n" +
+                "    ~~~~~~~~~~~~~~~~~~~~~~~                                   \n" +
+                "     \n" +
+                "     ");
+    }
+}

car-pay/car-pay-server/src/main/java/com/pay/controller/OrderController.java

@@ -0,0 +1,35 @@
+package com.pay.controller;
+
+import com.boot.common.core.domain.Result;
+import com.pay.common.CustomerOrder;
+import com.pay.service.PayService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * @ClassName OrderController
+ * @Description 描述
+ * @Author Di.Wu
+ * @Date 2024/3/6 22:38
+ */
+@RestController
+public class OrderController {
+
+
+    @Autowired
+    private PayService service;
+
+    @PostMapping("/list")
+    public Result<List<CustomerOrder>> list(){
+
+        List<CustomerOrder> list = service.list();
+
+        return Result.ok(list);
+    }
+
+
+
+}

car-pay/car-pay-server/src/main/java/com/pay/controller/payController.java

@@ -0,0 +1,205 @@
+package com.pay.controller;
+
+import com.alipay.api.AlipayApiException;
+import com.alipay.api.AlipayClient;
+import com.alipay.api.DefaultAlipayClient;
+import com.alipay.api.internal.util.AlipaySignature;
+import com.alipay.api.request.AlipayTradePagePayRequest;
+import com.pay.common.AlipayConfig;
+import com.pay.common.CustomerOrder;
+import com.pay.service.PayService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @ClassName payController
+ * @Description 描述
+ * @Author Di.Wu
+ * @Date 2024/3/5 21:44
+ */
+@RestController
+public class payController {
+
+    @Autowired
+    private AlipayConfig alipayConfig;
+
+    //支付宝网关地址
+    private static final String GATEWAY_URL ="https://openapi-sandbox.dl.alipaydev.com/gateway.do";
+    //格式
+    private static final String FORMAT = "JSON";
+    //字符集
+    private static final String CHARSET = "UTF-8";
+    //签名算法类型
+    private static final String SIGN_TYPE = "RSA2";
+
+    private static final String PAY_SUCCESS = "支付成功";
+
+
+    @Autowired
+    private PayService service;
+
+    @GetMapping("/pay")
+    public void  pay(CustomerOrder customerOrder, HttpServletResponse httpServletResponse)throws Exception{
+
+
+        // 创建支付宝客户端    // 创建支付宝客户端
+        AlipayClient alipayClient = new DefaultAlipayClient(
+                GATEWAY_URL, alipayConfig.getAppId(),
+                alipayConfig.getAppPrivateKey(),
+                FORMAT,
+                CHARSET,
+                alipayConfig.getAlipayPublicKey(),
+                SIGN_TYPE
+        );
+
+        // 创建支付请求
+        AlipayTradePagePayRequest request = new AlipayTradePagePayRequest();
+//        // 设置同步回调地址
+//        alipayRequest.setReturnUrl(alipayConfig.getReturnUrl());
+        // 设置异步通知地址
+        request.setNotifyUrl(alipayConfig.getNotifyUrl());
+//        // 设置异步回调地址
+//        alipayRequest.setNotifyUrl(alipayConfig.getNotifyUrl());
+        // 填充参数
+        // 设置订单信息
+        request.setBizContent("{\"out_trade_no\":\"" + customerOrder.getOrderId() + "\","
+                + "\"total_amount\":\"" + customerOrder.getOrderPrice() + "\","
+                + "\"subject\":\"" + customerOrder.getOrderSubject() + "\","
+                + "\"product_code\":\"FAST_INSTANT_TRADE_PAY\"}");
+
+        request.setReturnUrl("http://localhost:8080/pay/success");
+        String form = "";
+        try {
+           form = alipayClient.pageExecute(request).getBody();  //调用SDK生成表单
+        }catch (AlipayApiException e){
+            e.printStackTrace();
+        }
+        httpServletResponse.setContentType("text/html;charset=" + CHARSET);
+        httpServletResponse.getWriter().write(form);  //直接将完整的表单html输出到页面
+        httpServletResponse.getWriter().flush();
+        // 直接将完整的表单html输出到页面
+        httpServletResponse.getWriter().close();
+
+   }
+//
+//
+
+
+//    @GetMapping("/pay") // &subject=xxx&traceNo=xxx&totalAmount=xxx
+//    public void pay(CustomerOrder order, HttpServletResponse httpResponse) throws Exception {
+//        AlipayClient alipayClient = new DefaultAlipayClient(GATEWAY_URL, alipayConfig.getAppId(),
+//                alipayConfig.getAppPrivateKey(), FORMAT, CHARSET, alipayConfig.getAlipayPublicKey(), SIGN_TYPE);
+//        AlipayTradePagePayRequest request = new AlipayTradePagePayRequest();
+//        request.setNotifyUrl(alipayConfig.getNotifyUrl());
+//        request.setBizContent("{\"out_trade_no\":\"" + order.getOrderId() + "\","
+//                + "\"total_amount\":\"" + order.getOrderPrice() + "\","
+//                + "\"subject\":\"" + order.getOrderSubject() + "\","
+//                + "\"product_code\":\"FAST_INSTANT_TRADE_PAY\"}");
+//        request.setReturnUrl("http://localhost/order/order");
+//        String form = "";
+//        try {
+//            form = alipayClient.pageExecute(request).getBody(); // 调用SDK生成表单
+//        } catch (AlipayApiException e) {
+//            e.printStackTrace();
+//        }
+//        httpResponse.setContentType("text/html;charset=" + CHARSET);
+//        httpResponse.getWriter().write(form);// 直接将完整的表单html输出到页面
+//        httpResponse.getWriter().flush();
+//        httpResponse.getWriter().close();
+//    }
+
+
+
+
+
+//        @PostMapping("/notify") //注意这个必须是post接口  因为要接受到支付成功返回的信息
+//    public String payNotify(HttpServletRequest request)throws Exception{
+//        if(request.getParameter("trade_status").equals("TRADE_SUCCESS")){
+//            System.out.println("~~~~~~~~支付异步回调~~~~~~~~~");
+//        }
+//
+//        HashMap<String, String> hashMap = new HashMap<>();
+//
+//        Map<String, String[]> parameterMap = request.getParameterMap();
+//
+//        for (String name : parameterMap.keySet()) {
+//            hashMap.put(name, request.getParameter(name));
+//        }
+//
+//        String tradeNo = hashMap.get("out_trade_no");
+//
+//        String gmtPayment = hashMap.get("gmt_payment");
+//
+//        String alipayTradeNo = hashMap.get("trade_no");
+//
+//        String sign = hashMap.get("sign");
+//
+//        String content = AlipaySignature.getSignCheckContentV1(hashMap);  //获取要验证支付宝返回参数
+//
+//        boolean checkContent  = AlipaySignature.rsa256CheckContent(content, sign, alipayConfig.getAlipayPublicKey(),  "UTF-8"  );
+//
+//
+//        //支付宝验签
+//        if(checkContent){
+//            System.out.println("交易名称"+hashMap.get("subject"));
+//            System.out.println("交易状态"+hashMap.get("trade_status"));
+//            System.out.println("支付宝交易凭证号"+hashMap.get("trade_no"));
+//            System.out.println("商户订单号"+hashMap.get("out_trade_no"));
+//            System.out.println("交易金额"+hashMap.get("total_amount"));
+//        }
+//
+//        return PAY_SUCCESS;
+//    }
+
+
+
+
+
+    @PostMapping("/notify") // 注意这里必须是POST接口
+    public String payNotify(HttpServletRequest request) throws Exception {
+        if (request.getParameter("trade_status").equals("TRADE_SUCCESS")) {
+            System.out.println("=========支付宝异步回调========");
+
+            Map<String, String> params = new HashMap<>();
+            Map<String, String[]> requestParams = request.getParameterMap();
+            for (String name : requestParams.keySet()) {
+                params.put(name, request.getParameter(name));
+// System.out.println(name + " = " + request.getParameter(name));
+            }
+
+            String tradeNo = params.get("out_trade_no");
+            String gmtPayment = params.get("gmt_payment");
+            String alipayTradeNo = params.get("trade_no");
+            String sign = params.get("sign");
+            String content = AlipaySignature.getSignCheckContentV1(params);
+            boolean checkSignature = AlipaySignature.rsa256CheckContent(content, sign, alipayConfig.getAlipayPublicKey(), "UTF-8");
+
+// 支付宝验签
+            if (checkSignature) {
+// 验签通过
+                System.out.println("交易名称: " + params.get("subject"));
+                System.out.println("交易状态: " + params.get("trade_status"));
+                System.out.println("支付宝交易凭证号: " + params.get("trade_no"));
+                System.out.println("商户订单号: " + params.get("out_trade_no"));
+                System.out.println("交易金额: " + params.get("total_amount"));
+                System.out.println("买家在支付宝唯一id: " + params.get("buyer_id"));
+                System.out.println("买家付款时间: " + params.get("gmt_payment"));
+                System.out.println("买家付款金额: " + params.get("buyer_pay_amount"));
+
+// 更新订单未已支付
+
+//查询订单表中的该订单的数据
+            }
+        }
+        return PAY_SUCCESS;
+    }
+
+
+}

car-pay/car-pay-server/src/main/java/com/pay/mapper/PayMapper.java

@@ -0,0 +1,17 @@
+package com.pay.mapper;
+
+import com.pay.common.CustomerOrder;
+
+import java.util.List;
+
+/**
+ * @ClassName PayMapper
+ * @Description 描述
+ * @Author Di.Wu
+ * @Date 2024/3/6 19:05
+ */
+public interface PayMapper {
+
+
+    List<CustomerOrder> list();
+}

car-pay/car-pay-server/src/main/java/com/pay/service/PayService.java

@@ -0,0 +1,17 @@
+package com.pay.service;
+
+import com.pay.common.CustomerOrder;
+
+import java.util.List;
+
+/**
+ * @ClassName PayService
+ * @Description 描述
+ * @Author Di.Wu
+ * @Date 2024/3/6 19:04
+ */
+public interface PayService {
+
+
+    List<CustomerOrder> list();
+}

car-pay/car-pay-server/src/main/java/com/pay/service/impl/PayServiceImpl.java

@@ -0,0 +1,33 @@
+package com.pay.service.impl;
+
+import com.pay.common.CustomerOrder;
+import com.pay.mapper.PayMapper;
+import com.pay.service.PayService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @ClassName PayServiceImpl
+ * @Description 描述
+ * @Author Di.Wu
+ * @Date 2024/3/6 19:04
+ */
+@Service
+public class PayServiceImpl implements PayService {
+
+
+    @Autowired
+    private PayMapper mapper;
+
+
+    @Override
+    public List<CustomerOrder> list() {
+
+        List<CustomerOrder> list = mapper.list();
+
+        return list;
+    }
+
+}