代码提交

.idea/compiler.xml

@@ -17,7 +17,6 @@
     </annotationProcessing>
     <bytecodeTargetLevel>
       <module name="han-hai-module-pay" target="1.8" />
-      <module name="han-hai-parent" target="1.8" />
       <module name="jeecg-boot-base" target="1.8" />
       <module name="jeecg-boot-base-api" target="1.8" />
       <module name="jeecg-boot-base-core" target="1.8" />
@@ -25,6 +24,7 @@
       <module name="jeecg-boot-module-system" target="1.8" />
       <module name="jeecg-system-cloud-api" target="1.8" />
       <module name="jeecg-system-local-api" target="1.8" />
+      <module name="yaodu-api" target="1.8" />
     </bytecodeTargetLevel>
   </component>
   <component name="JavacSettings">

.idea/modules.xml

@@ -3,7 +3,6 @@
   <component name="ProjectModuleManager">
     <modules>
       <module fileurl="file://$PROJECT_DIR$/han-hai-module-pay/han-hai-module-pay.iml" filepath="$PROJECT_DIR$/han-hai-module-pay/han-hai-module-pay.iml" />
-      <module fileurl="file://$PROJECT_DIR$/han-hai-parent.iml" filepath="$PROJECT_DIR$/han-hai-parent.iml" />
       <module fileurl="file://$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base.iml" filepath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base.iml" />
       <module fileurl="file://$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-api/jeecg-boot-base-api.iml" filepath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-api/jeecg-boot-base-api.iml" />
       <module fileurl="file://$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/jeecg-boot-base-core.iml" filepath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-core/jeecg-boot-base-core.iml" />
@@ -11,6 +10,7 @@
       <module fileurl="file://$PROJECT_DIR$/jeecg-boot-module-system/jeecg-boot-module-system.iml" filepath="$PROJECT_DIR$/jeecg-boot-module-system/jeecg-boot-module-system.iml" />
       <module fileurl="file://$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-cloud-api/jeecg-system-cloud-api.iml" filepath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-cloud-api/jeecg-system-cloud-api.iml" />
       <module fileurl="file://$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-local-api/jeecg-system-local-api.iml" filepath="$PROJECT_DIR$/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-local-api/jeecg-system-local-api.iml" />
+      <module fileurl="file://$PROJECT_DIR$/yaodu-api.iml" filepath="$PROJECT_DIR$/yaodu-api.iml" />
     </modules>
   </component>
 </project>

.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.png" 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.png" 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.png" 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.png" 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.png" 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.png" 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.png" 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.png" 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.png" 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.png" 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.png" 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.png" 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.png" 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.png" 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.png" 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.png" 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.png" 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.png" 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.png" 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.png" 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.png" 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.png" 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.png" 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.png" 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.png" 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.png" 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.png" 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>

admin-hanhai-vue/.env.development

@@ -1,5 +1,5 @@
 NODE_ENV=development
-VUE_APP_API_BASE_URL=http://localhost:8002/cheer-admin/
+VUE_APP_API_BASE_URL=http://localhost:8000/cheer-admin/
 VUE_APP_CAS_BASE_URL=http://cas.example.org:8443/cas
 VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview
 

admin-hanhai-vue/.env.production

@@ -1,4 +1,4 @@
 NODE_ENV=production
-VUE_APP_API_BASE_URL=http://localhost:8002/cheer-admin/
+VUE_APP_API_BASE_URL=http://localhost:8000/cheer-admin/
 VUE_APP_CAS_BASE_URL=http://localhost:8888/cas
 VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview

han-hai-module-pay/han-hai-module-pay.iml

@@ -11,12 +11,14 @@
     </facet>
   </component>
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
-    <output url="file://$MODULE_DIR$/target/classes" />
-    <output-test url="file://$MODULE_DIR$/target/test-classes" />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
-      <excludeFolder url="file://$MODULE_DIR$/target" />
+    <output url="file://$MODULE_DIR$/../han-hai-module-pay/target/classes" />
+    <output-test url="file://$MODULE_DIR$/../han-hai-module-pay/target/test-classes" />
+    <content url="file://$MODULE_DIR$/../han-hai-module-pay">
+      <sourceFolder url="file://$MODULE_DIR$/../han-hai-module-pay/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../han-hai-module-pay/src/main/resources" type="java-resource" />
+      <excludeFolder url="file://$MODULE_DIR$/../han-hai-module-pay/${project.build.directory}/classes" />
+      <excludeFolder url="file://$MODULE_DIR$/../han-hai-module-pay/${project.build.directory}/test-classes" />
+      <excludeFolder url="file://$MODULE_DIR$/../han-hai-module-pay/target" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />

han-hai-module-pay/src/main/java/org/jeecg/modules/pay/MpWxPayService.java

@@ -142,13 +142,11 @@ public class MpWxPayService {
         request.setTotalFee(price);           //总金额|分计
         request.setSpbillCreateIp(clientIp);  //终端IP
         request.setNotifyUrl(wxPay.notifyUrl);//设置回调路径
-//        request.setNotifyUrl("http://h5.xzaiyp.top/a-notice-api/pay-api/info/notify");//设置回调路径
         request.setProductId(productId);      //商品id
         request.setOpenid(openId);            //JSAPI OPENID
         if (dev){
             request.setTotalFee(price);
             request.setNotifyUrl(wxPay.notifyUrlDev);
-//            request.setNotifyUrl("http://h5.xzaiyp.top/a-notice-api/pay-api/info/notify");//设置回调路径
         }
         try {
             Object order = wxPayService.createOrder(request);

jeecg-boot-base/jeecg-boot-base-api/jeecg-boot-base-api.iml

@@ -4,6 +4,8 @@
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/${project.build.directory}/classes" />
+      <excludeFolder url="file://$MODULE_DIR$/${project.build.directory}/test-classes" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
     <orderEntry type="inheritedJdk" />

jeecg-boot-base/jeecg-boot-base-api/jeecg-system-cloud-api/jeecg-system-cloud-api.iml

@@ -10,7 +10,9 @@
       <configuration>
         <setting name="validation-enabled" value="true" />
         <setting name="provider-name" value="Hibernate" />
-        <datasource-mapping />
+        <datasource-mapping>
+          <factory-entry name="jeecg-system-cloud-api" />
+        </datasource-mapping>
         <naming-strategy-map />
       </configuration>
     </facet>
@@ -23,6 +25,8 @@
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <excludeFolder url="file://$MODULE_DIR$/${project.build.directory}/classes" />
+      <excludeFolder url="file://$MODULE_DIR$/${project.build.directory}/test-classes" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
     <orderEntry type="inheritedJdk" />

jeecg-boot-base/jeecg-boot-base-api/jeecg-system-cloud-api/target/maven-archiver/pom.properties

@@ -1,3 +0,0 @@
-artifactId=jeecg-system-cloud-api
-groupId=org.jeecgframework.boot
-version=3.2.0

jeecg-boot-base/jeecg-boot-base-api/jeecg-system-cloud-api/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -1,3 +0,0 @@
-org/jeecg/common/system/api/fallback/SysBaseAPIFallback.class
-org/jeecg/common/system/api/ISysBaseAPI.class
-org/jeecg/common/system/api/factory/SysBaseAPIFallbackFactory.class

jeecg-boot-base/jeecg-boot-base-api/jeecg-system-cloud-api/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -1,4 +0,0 @@
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-cloud-api/src/main/java/org/jeecg/common/system/api/ISysBaseAPI.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-cloud-api/src/main/java/org/jeecg/common/system/api/factory/SysBaseAPIFallbackFactory.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-cloud-api/src/main/java/org/jeecg/config/FeignConfig.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-cloud-api/src/main/java/org/jeecg/common/system/api/fallback/SysBaseAPIFallback.java

jeecg-boot-base/jeecg-boot-base-api/jeecg-system-local-api/jeecg-system-local-api.iml

@@ -10,7 +10,9 @@
       <configuration>
         <setting name="validation-enabled" value="true" />
         <setting name="provider-name" value="Hibernate" />
-        <datasource-mapping />
+        <datasource-mapping>
+          <factory-entry name="jeecg-system-local-api" />
+        </datasource-mapping>
         <naming-strategy-map />
       </configuration>
     </facet>
@@ -23,6 +25,8 @@
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <excludeFolder url="file://$MODULE_DIR$/${project.build.directory}/classes" />
+      <excludeFolder url="file://$MODULE_DIR$/${project.build.directory}/test-classes" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
     <orderEntry type="inheritedJdk" />

jeecg-boot-base/jeecg-boot-base-api/jeecg-system-local-api/target/maven-archiver/pom.properties

@@ -1,3 +0,0 @@
-artifactId=jeecg-system-local-api
-groupId=org.jeecgframework.boot
-version=3.2.0

jeecg-boot-base/jeecg-boot-base-api/jeecg-system-local-api/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -1 +0,0 @@
-org/jeecg/common/system/api/ISysBaseAPI.class

jeecg-boot-base/jeecg-boot-base-api/jeecg-system-local-api/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -1 +0,0 @@
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-local-api/src/main/java/org/jeecg/common/system/api/ISysBaseAPI.java

jeecg-boot-base/jeecg-boot-base-core/jeecg-boot-base-core.iml

@@ -10,7 +10,9 @@
       <configuration>
         <setting name="validation-enabled" value="true" />
         <setting name="provider-name" value="Hibernate" />
-        <datasource-mapping />
+        <datasource-mapping>
+          <factory-entry name="jeecg-boot-base-core" />
+        </datasource-mapping>
         <naming-strategy-map />
       </configuration>
     </facet>
@@ -24,6 +26,8 @@
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <excludeFolder url="file://$MODULE_DIR$/${project.build.directory}/classes" />
+      <excludeFolder url="file://$MODULE_DIR$/${project.build.directory}/test-classes" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
     <orderEntry type="inheritedJdk" />

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java

@@ -78,6 +78,7 @@ public class ShiroConfig {
         //开启小程序不需要token的接口过滤 （现在先全开放后面再来改）
         filterChainDefinitionMap.put("/cheer/login/**", "anon");
         filterChainDefinitionMap.put("/cheer/info/**", "anon");
+        filterChainDefinitionMap.put("/cheer/two/**", "anon");
 
         filterChainDefinitionMap.put("/api/order/**", "anon");
         filterChainDefinitionMap.put("/school/login/**", "anon");

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerRecharge/controller/CheerRechargeController.java

@@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
  /**
  * @Description: 充值套餐
  * @Author: jeecg-boot
- * @Date:   2024-08-29
+ * @Date:   2024-10-06
  * @Version: V1.0
  */
 @Api(tags="充值套餐")

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerRecharge/entity/CheerRecharge.java

@@ -20,7 +20,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 充值套餐
  * @Author: jeecg-boot
- * @Date:   2024-08-29
+ * @Date:   2024-10-06
  * @Version: V1.0
  */
 @Data
@@ -47,6 +47,11 @@ public class CheerRecharge implements Serializable {
 	/**更新日期*/
     @ApiModelProperty(value = "更新日期")
     private java.util.Date updateTime;
+	/**加油站*/
+	@Excel(name = "加油站", width = 15, dictTable = "cheer_shop", dicText = "name", dicCode = "id")
+	@Dict(dictTable = "cheer_shop", dicText = "name", dicCode = "id")
+    @ApiModelProperty(value = "加油站")
+    private java.lang.String shopId;
 	/**金融*/
 	@Excel(name = "金融", width = 15)
     @ApiModelProperty(value = "金融")

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerRecharge/mapper/CheerRechargeMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: 充值套餐
  * @Author: jeecg-boot
- * @Date:   2024-08-29
+ * @Date:   2024-10-06
  * @Version: V1.0
  */
 public interface CheerRechargeMapper extends BaseMapper<CheerRecharge> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerRecharge/service/ICheerRechargeService.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: 充值套餐
  * @Author: jeecg-boot
- * @Date:   2024-08-29
+ * @Date:   2024-10-06
  * @Version: V1.0
  */
 public interface ICheerRechargeService extends IService<CheerRecharge> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerRecharge/service/impl/CheerRechargeServiceImpl.java

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: 充值套餐
  * @Author: jeecg-boot
- * @Date:   2024-08-29
+ * @Date:   2024-10-06
  * @Version: V1.0
  */
 @Service

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerRecharge/vue/CheerRechargeList.vue

@@ -4,6 +4,21 @@
     <div class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-row :gutter="24">
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="加油站">
+              <j-search-select-tag placeholder="请选择加油站" v-model="queryParam.shopId" dict="cheer_shop,name,id"/>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
+              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+              <a @click="handleToggleSearch" style="margin-left: 8px">
+                {{ toggleSearchStatus ? '收起' : '展开' }}
+                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+              </a>
+            </span>
+          </a-col>
         </a-row>
       </a-form>
     </div>
@@ -99,6 +114,7 @@
   import { mixinDevice } from '@/utils/mixin'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import CheerRechargeModal from './modules/CheerRechargeModal'
+  import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
 
   export default {
     name: 'CheerRechargeList',
@@ -121,6 +137,11 @@
               return parseInt(index)+1;
             }
           },
+          {
+            title:'加油站',
+            align:"center",
+            dataIndex: 'shopId_dictText'
+          },
           {
             title:'金融',
             align:"center",
@@ -160,6 +181,7 @@
       },
       getSuperFieldList(){
         let fieldList=[];
+        fieldList.push({type:'sel_search',value:'shopId',text:'加油站',dictTable:"cheer_shop", dictText:'name', dictCode:'id'})
         fieldList.push({type:'BigDecimal',value:'price',text:'金融',dictCode:''})
         this.superFieldList = fieldList
       }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerRecharge/vue/modules/CheerRechargeForm.vue

@@ -3,6 +3,11 @@
     <j-form-container :disabled="formDisabled">
       <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
         <a-row>
+          <a-col :span="24">
+            <a-form-model-item label="加油站" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="shopId">
+              <j-search-select-tag v-model="model.shopId" dict="cheer_shop,name,id"  />
+            </a-form-model-item>
+          </a-col>
           <a-col :span="24">
             <a-form-model-item label="金融" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="price">
               <a-input-number v-model="model.price" placeholder="请输入金融" style="width: 100%" />

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerRecharge/vue3/CheerRecharge.data.ts

@@ -5,6 +5,11 @@ import { render } from '/@/utils/common/renderUtils';
 //列表数据
 export const columns: BasicColumn[] = [
     {
+    title: '加油站',
+    align:"center",
+    dataIndex: 'shopId_dictText'
+   },
+   {
     title: '金融',
     align:"center",
     dataIndex: 'price'
@@ -12,9 +17,26 @@ export const columns: BasicColumn[] = [
 ];
 //查询数据
 export const searchFormSchema: FormSchema[] = [
+	{
+      label: "加油站",
+      field: "shopId",
+      component: 'JSearchSelect',
+      componentProps:{
+         dict:"cheer_shop,name,id"
+      },
+      colProps: {span: 6},
+ 	},
 ];
 //表单数据
 export const formSchema: FormSchema[] = [
+  {
+    label: '加油站',
+    field: 'shopId',
+    component: 'JSearchSelect',
+    componentProps:{
+       dict:"cheer_shop,name,id"
+    },
+  },
   {
     label: '金融',
     field: 'price',

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerWater/controller/CheerWaterController.java

@@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
  /**
  * @Description: 加油流水表
  * @Author: jeecg-boot
- * @Date:   2024-09-09
+ * @Date:   2024-10-06
  * @Version: V1.0
  */
 @Api(tags="加油流水表")

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerWater/entity/CheerWater.java

@@ -20,7 +20,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 加油流水表
  * @Author: jeecg-boot
- * @Date:   2024-09-09
+ * @Date:   2024-10-06
  * @Version: V1.0
  */
 @Data
@@ -47,6 +47,11 @@ public class CheerWater implements Serializable {
 	/**更新日期*/
     @ApiModelProperty(value = "更新日期")
     private java.util.Date updateTime;
+	/**加油站*/
+	@Excel(name = "加油站", width = 15, dictTable = "cheer_shop", dicText = "name", dicCode = "id")
+	@Dict(dictTable = "cheer_shop", dicText = "name", dicCode = "id")
+    @ApiModelProperty(value = "加油站")
+    private java.lang.String shopId;
 	/**原价*/
 	@Excel(name = "原价", width = 15)
     @ApiModelProperty(value = "原价")

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerWater/mapper/CheerWaterMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: 加油流水表
  * @Author: jeecg-boot
- * @Date:   2024-09-09
+ * @Date:   2024-10-06
  * @Version: V1.0
  */
 public interface CheerWaterMapper extends BaseMapper<CheerWater> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerWater/service/ICheerWaterService.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: 加油流水表
  * @Author: jeecg-boot
- * @Date:   2024-09-09
+ * @Date:   2024-10-06
  * @Version: V1.0
  */
 public interface ICheerWaterService extends IService<CheerWater> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerWater/service/impl/CheerWaterServiceImpl.java

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: 加油流水表
  * @Author: jeecg-boot
- * @Date:   2024-09-09
+ * @Date:   2024-10-06
  * @Version: V1.0
  */
 @Service

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerWater/vue/CheerWaterList.vue

@@ -4,6 +4,11 @@
     <div class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-row :gutter="24">
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="加油站">
+              <j-search-select-tag placeholder="请选择加油站" v-model="queryParam.shopId" dict="cheer_shop,name,id"/>
+            </a-form-item>
+          </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="支付状态">
               <j-search-select-tag placeholder="请选择支付状态" v-model="queryParam.state" dict=",,water_state"/>
@@ -143,6 +148,11 @@
             sorter: true,
             dataIndex: 'createTime'
           },
+          {
+            title:'加油站',
+            align:"center",
+            dataIndex: 'shopId_dictText'
+          },
           {
             title:'原价',
             align:"center",
@@ -204,6 +214,7 @@
       getSuperFieldList(){
         let fieldList=[];
         fieldList.push({type:'datetime',value:'createTime',text:'创建日期'})
+        fieldList.push({type:'sel_search',value:'shopId',text:'加油站',dictTable:"cheer_shop", dictText:'name', dictCode:'id'})
         fieldList.push({type:'BigDecimal',value:'oldPrice',text:'原价',dictCode:''})
         fieldList.push({type:'BigDecimal',value:'price',text:'支付价',dictCode:''})
         fieldList.push({type:'sel_search',value:'userId',text:'用户标识',dictTable:"han_hai_member", dictText:'nick_name', dictCode:'id'})

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerWater/vue/modules/CheerWaterForm.vue

@@ -3,6 +3,11 @@
     <j-form-container :disabled="formDisabled">
       <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
         <a-row>
+          <a-col :span="24">
+            <a-form-model-item label="加油站" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="shopId">
+              <j-search-select-tag v-model="model.shopId" dict="cheer_shop,name,id"  />
+            </a-form-model-item>
+          </a-col>
           <a-col :span="24">
             <a-form-model-item label="原价" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="oldPrice">
               <a-input-number v-model="model.oldPrice" placeholder="请输入原价" style="width: 100%" />

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerWater/vue3/CheerWater.data.ts

@@ -10,6 +10,11 @@ export const columns: BasicColumn[] = [
     sorter: true,
     dataIndex: 'createTime'
    },
+   {
+    title: '加油站',
+    align:"center",
+    dataIndex: 'shopId_dictText'
+   },
    {
     title: '原价',
     align:"center",
@@ -40,6 +45,15 @@ export const columns: BasicColumn[] = [
 //查询数据
 export const searchFormSchema: FormSchema[] = [
 	{
+      label: "加油站",
+      field: "shopId",
+      component: 'JSearchSelect',
+      componentProps:{
+         dict:"cheer_shop,name,id"
+      },
+      colProps: {span: 6},
+ 	},
+	{
       label: "支付状态",
       field: "state",
       component: 'JSearchSelect',
@@ -51,6 +65,14 @@ export const searchFormSchema: FormSchema[] = [
 ];
 //表单数据
 export const formSchema: FormSchema[] = [
+  {
+    label: '加油站',
+    field: 'shopId',
+    component: 'JSearchSelect',
+    componentProps:{
+       dict:"cheer_shop,name,id"
+    },
+  },
   {
     label: '原价',
     field: 'oldPrice',

jeecg-boot-base/jeecg-boot-base-core/target/maven-archiver/pom.properties

@@ -1,3 +0,0 @@
-artifactId=jeecg-boot-base-core
-groupId=org.jeecgframework.boot
-version=3.2.0

jeecg-boot-base/jeecg-boot-base-core/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -1,183 +0,0 @@
-org/jeecg/common/api/dto/OnlineAuthDTO.class
-org/jeecg/common/aspect/annotation/AutoDict.class
-org/jeecg/common/util/security/entity/SecuritySignReq.class
-org/jeecg/common/aspect/UrlMatchEnum.class
-org/jeecg/common/api/dto/LogDTO.class
-org/jeecg/common/util/SpringContextUtils.class
-org/jeecg/common/api/dto/FileDownDTO.class
-org/jeecg/common/constant/enums/ModuleType.class
-org/jeecg/modules/bean/LoginReq.class
-org/jeecg/config/mybatis/TenantContext.class
-org/jeecg/config/WebMvcConfiguration.class
-org/jeecg/common/util/MyClassLoader.class
-org/jeecg/common/util/BrowserType.class
-org/jeecg/common/system/query/QueryRuleEnum.class
-org/jeecg/modules/cheerConf/service/ICheerConfService.class
-org/jeecg/common/util/YouBianCodeUtil.class
-org/jeecg/common/system/vo/SysCategoryModel.class
-org/jeecg/common/aspect/annotation/AutoLog.class
-org/jeecg/common/constant/ProvinceCityArea.class
-org/jeecg/common/system/vo/DictQuery.class
-org/jeecg/common/aspect/annotation/OnlineAuth.class
-org/jeecg/common/util/RestDesformUtil.class
-org/jeecg/common/es/JeecgElasticsearchTemplate.class
-org/jeecg/common/api/dto/message/MessageDTO.class
-org/jeecg/common/system/vo/DictModelMany.class
-org/jeecg/modules/cheerRecharge/controller/CheerRechargeController.class
-org/jeecg/common/system/base/service/JeecgService.class
-org/jeecg/config/mybatis/MybatisInterceptor.class
-org/jeecg/config/sign/util/BodyReaderHttpServletRequestWrapper$1.class
-org/jeecg/common/constant/enums/OperateTypeEnum.class
-org/jeecg/common/exception/JeecgBoot401Exception.class
-org/jeecg/common/util/BrowserUtils.class
-org/jeecg/common/util/oConvertUtils.class
-org/jeecg/common/util/CommonUtils.class
-org/jeecg/modules/cheerWater/controller/CheerWaterController.class
-org/jeecg/common/util/DateUtils$3.class
-org/jeecg/modules/bean/ConvertUtils.class
-org/jeecg/common/exception/JeecgBootExceptionHandler.class
-org/jeecg/config/shiro/filters/JwtFilter.class
-org/jeecg/common/util/encryption/EncryptedString.class
-org/jeecg/config/oss/MinioConfig.class
-org/jeecg/modules/cheerRecharge/service/ICheerRechargeService.class
-org/jeecg/modules/base/mapper/BaseCommonMapper.class
-org/jeecg/common/handler/IFillRuleHandler.class
-org/jeecg/config/sign/util/SignUtil.class
-org/jeecg/config/DruidConfig.class
-org/jeecg/config/oss/OssConfiguration.class
-org/jeecg/common/system/util/JwtUtil.class
-org/jeecg/common/util/DateUtils.class
-org/jeecg/common/util/PmsUtil.class
-org/jeecg/modules/hanHaiMember/service/impl/HanHaiMemberServiceImpl.class
-org/jeecg/config/Swagger2Config.class
-org/jeecg/common/util/PathMatcherUtil$SpringAntMatcher.class
-org/jeecg/common/aspect/PermissionDataAspect.class
-org/jeecg/modules/cheerConf/service/impl/CheerConfServiceImpl.class
-org/jeecg/common/constant/ServiceNameConstants.class
-org/jeecg/common/system/vo/DynamicDataSourceModel.class
-org/jeecg/config/thirdapp/ThirdAppTypeItemVo.class
-org/jeecg/common/api/dto/message/TemplateMessageDTO.class
-org/jeecg/config/thirdapp/ThirdAppTypeConfig.class
-org/jeecg/config/DruidConfig$RemoveAdFilter.class
-org/jeecg/config/shiro/ShiroRealm.class
-org/jeecg/common/util/SysAnnmentTypeEnum.class
-org/jeecg/common/constant/ProvinceCityArea$Area.class
-org/jeecg/common/util/security/entity/SecurityResp.class
-org/jeecg/common/system/vo/SysDepartModel.class
-org/jeecg/common/util/DateUtils$6.class
-org/jeecg/common/aspect/annotation/AutoLowApp.class
-org/jeecg/common/exception/JeecgBootException.class
-org/jeecg/common/system/base/entity/JeecgEntity.class
-org/jeecg/common/util/UUIDGenerator.class
-org/jeecg/common/constant/CommonConstant.class
-org/jeecg/config/sign/util/BodyReaderHttpServletRequestWrapper.class
-org/jeecg/common/util/security/entity/SecurityReq.class
-org/jeecg/config/CorsFilterCondition.class
-org/jeecg/config/mybatis/MybatisPlusSaasConfig.class
-org/jeecg/config/JeecgCloudCondition.class
-org/jeecg/common/util/PathMatcherUtil$1.class
-org/jeecg/config/shiro/JwtToken.class
-org/jeecg/modules/cheerConf/controller/CheerConfController.class
-org/jeecg/common/aspect/AutoLogAspect$1.class
-org/jeecg/modules/hanHaiMember/service/IHanHaiMemberService.class
-org/jeecg/common/util/security/SecurityTools.class
-org/jeecg/common/util/HTMLUtils.class
-org/jeecg/common/util/PathMatcherUtil.class
-org/jeecg/modules/cheerConf/entity/CheerConf.class
-org/jeecg/common/util/security/AbstractQueryBlackListHandler.class
-org/jeecg/common/util/encryption/AesEncryptUtil.class
-org/jeecg/common/api/vo/Result.class
-org/jeecg/common/util/dynamic/db/DataSourceCachePool.class
-org/jeecg/common/constant/FillRuleConstant.class
-org/jeecg/common/system/query/QueryGenerator$1.class
-org/jeecg/modules/cheerRecharge/service/impl/CheerRechargeServiceImpl.class
-org/jeecg/modules/cheerRecharge/entity/CheerRecharge.class
-org/jeecg/common/system/query/QueryCondition.class
-org/jeecg/common/util/ReflectHelper.class
-org/jeecg/common/util/DateUtils$5.class
-org/jeecg/config/AutoPoiDictConfig.class
-org/jeecg/common/util/security/entity/SecuritySignResp.class
-org/jeecg/common/system/base/controller/JeecgController.class
-org/jeecg/modules/hanHaiMember/controller/HanHaiMemberController.class
-org/jeecg/common/constant/DataBaseConstant.class
-org/jeecg/common/constant/enums/RoleIndexConfigEnum.class
-org/jeecg/common/system/vo/SysPermissionDataRuleModel.class
-org/jeecg/common/util/DateUtils$4.class
-org/jeecg/common/util/oss/OssBootUtil.class
-org/jeecg/common/api/dto/FileUploadDTO.class
-org/jeecg/common/util/DateUtils$7.class
-org/jeecg/modules/cheerWater/mapper/CheerWaterMapper.class
-org/jeecg/common/constant/enums/CgformEnum.class
-org/jeecg/modules/hanHaiMember/entity/HanHaiMember.class
-org/jeecg/common/util/FillRuleUtil.class
-org/jeecg/common/system/util/JeecgDataAutorUtils.class
-org/jeecg/config/shiro/filters/CustomShiroFilterFactoryBean$MySpringShiroFilter.class
-org/jeecg/common/constant/enums/LowAppAopEnum.class
-org/jeecg/common/api/dto/message/TemplateDTO.class
-org/jeecg/config/mybatis/MybatisPlusSaasConfig$1.class
-org/jeecg/common/constant/CommonSendStatus.class
-org/jeecg/common/util/IpUtils.class
-org/jeecg/common/aspect/annotation/PermissionData.class
-org/jeecg/modules/cheerWater/service/impl/CheerWaterServiceImpl.class
-org/jeecg/modules/cheerRecharge/mapper/CheerRechargeMapper.class
-org/jeecg/common/util/DateUtils$1.class
-org/jeecg/common/constant/WebsocketConst.class
-org/jeecg/common/util/MinioUtil.class
-org/jeecg/common/es/QueryStringBuilder.class
-org/jeecg/common/system/vo/SysUserCacheInfo.class
-org/jeecg/modules/cheerWater/entity/CheerWater.class
-org/jeecg/common/system/query/MatchTypeEnum.class
-org/jeecg/common/aspect/annotation/Dict.class
-org/jeecg/modules/base/service/BaseCommonService.class
-org/jeecg/common/util/DySmsHelper.class
-org/jeecg/config/shiro/filters/CustomShiroFilterFactoryBean.class
-org/jeecg/modules/base/service/impl/BaseCommonServiceImpl.class
-org/jeecg/config/WebSocketConfig.class
-org/jeecg/config/StaticConfig.class
-org/jeecg/config/shiro/filters/ResourceCheckFilter.class
-org/jeecg/common/util/dynamic/db/DbTypeUtils.class
-org/jeecg/config/vo/Shiro.class
-org/jeecg/config/thirdapp/ThirdAppConfig.class
-org/jeecg/modules/hanHaiMember/mapper/HanHaiMemberMapper.class
-org/jeecg/common/aspect/DictAspect.class
-org/jeecg/common/api/CommonAPI.class
-org/jeecg/modules/cheerWater/service/ICheerWaterService.class
-org/jeecg/config/AutoPoiConfig.class
-org/jeecg/common/util/DateUtils$2.class
-org/jeecg/modules/service/ApiLoginService.class
-org/jeecg/common/aspect/AutoLogAspect.class
-org/jeecg/config/sign/interceptor/SignAuthConfiguration.class
-org/jeecg/common/system/vo/DictModel.class
-org/jeecg/common/util/dynamic/db/FreemarkerParseFactory.class
-org/jeecg/common/util/RestUtil.class
-org/jeecg/common/constant/VxeSocketConst.class
-org/jeecg/common/util/ImportExcelUtil.class
-org/jeecg/common/util/PasswordUtil.class
-org/jeecg/common/system/query/QueryGenerator.class
-org/jeecg/config/Swagger2Config$1.class
-org/jeecg/common/util/security/entity/MyKeyPair.class
-org/jeecg/modules/service/AppletLoginService.class
-org/jeecg/config/sign/interceptor/SignAuthInterceptor.class
-org/jeecg/common/util/filter/FileTypeFilter.class
-org/jeecg/modules/cheerConf/mapper/CheerConfMapper.class
-org/jeecg/common/util/dynamic/db/DynamicDBUtil.class
-org/jeecg/modules/service/impl/AppletLoginServiceImpl.class
-org/jeecg/common/util/DySmsEnum.class
-org/jeecg/common/util/security/AbstractQueryBlackListHandler$QueryTable.class
-org/jeecg/common/util/PathMatcherUtil$Matcher.class
-org/jeecg/common/api/dto/message/BusMessageDTO.class
-org/jeecg/config/RestTemplateConfig.class
-org/jeecg/config/shiro/ShiroConfig.class
-org/jeecg/common/constant/SymbolConstant.class
-org/jeecg/common/util/SqlInjectionUtil.class
-org/jeecg/common/system/vo/ComboModel.class
-org/jeecg/common/api/dto/message/BusTemplateMessageDTO.class
-org/jeecg/common/util/Md5Util.class
-org/jeecg/modules/bean/HttpConf.class
-org/jeecg/config/JeeccgBaseConfig.class
-org/jeecg/common/util/filter/StrAttackFilter.class
-org/jeecg/common/system/base/service/impl/JeecgServiceImpl.class
-org/jeecg/modules/service/impl/ApiLoginServiceImpl.class
-org/jeecg/config/sign/util/HttpUtils.class
-org/jeecg/common/util/TokenUtils.class
-org/jeecg/common/system/vo/LoginUser.class

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

@@ -1,168 +0,0 @@
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/VxeSocketConst.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/SysDepartModel.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/api/CommonAPI.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/mybatis/MybatisPlusSaasConfig.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/PermissionDataAspect.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/vo/Shiro.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/DictModelMany.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerConf/mapper/CheerConfMapper.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/query/MatchTypeEnum.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerWater/service/impl/CheerWaterServiceImpl.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/filters/ResourceCheckFilter.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/dynamic/db/FreemarkerParseFactory.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/base/service/JeecgService.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/enums/LowAppAopEnum.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerRecharge/service/impl/CheerRechargeServiceImpl.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/superSearch/QueryRuleVo.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/api/dto/LogDTO.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/JwtToken.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/DruidConfig.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/RestDesformUtil.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/MinioUtil.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/SpringContextUtils.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/service/IHanHaiMemberService.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/mapper/BaseCommonMapper.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/mybatis/MybatisInterceptor.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/security/entity/SecuritySignReq.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/ReflectHelper.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/DySmsEnum.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/DictAspect.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/service/impl/HanHaiMemberServiceImpl.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/Md5Util.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/annotation/Dict.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/filter/FileTypeFilter.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/query/QueryCondition.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/base/service/impl/JeecgServiceImpl.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/entity/HanHaiMember.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerWater/entity/CheerWater.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/api/dto/message/TemplateMessageDTO.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/query/QueryGenerator.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerConf/service/impl/CheerConfServiceImpl.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/StaticConfig.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/PathMatcherUtil.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/dynamic/db/DynamicDBUtil.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/exception/JeecgBootException.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/encryption/AesEncryptUtil.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/TokenUtils.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/LoginUser.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/filter/StrAttackFilter.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/api/dto/message/MessageDTO.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/base/entity/JeecgEntity.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/api/dto/FileDownDTO.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/exception/JeecgBoot401Exception.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/query/QueryRuleEnum.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/annotation/PermissionData.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/superSearch/QueryRuleEnum.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/annotation/AutoLog.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/exception/JeecgBootExceptionHandler.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/SqlInjectionUtil.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerWater/mapper/CheerWaterMapper.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/PasswordUtil.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/JeecgCloudCondition.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/CommonUtils.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/UrlMatchEnum.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/FillRuleConstant.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/RestUtil.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/oss/MinioConfig.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/api/dto/message/BusMessageDTO.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/ComboModel.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/UUIDGenerator.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/bean/LoginReq.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/sign/interceptor/SignAuthConfiguration.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/handler/IFillRuleHandler.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/annotation/OnlineAuth.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/enums/OperateTypeEnum.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/FillRuleUtil.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroRealm.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/annotation/AutoDict.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/service/impl/AppletLoginServiceImpl.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/annotation/AutoLowApp.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/security/entity/SecuritySignResp.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerConf/controller/CheerConfController.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/bean/ConvertUtils.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/security/SecurityTools.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/thirdapp/ThirdAppTypeItemVo.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/encryption/EncryptedString.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/SysPermissionDataRuleModel.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/CommonSendStatus.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/mybatis/JeecgTenantParser.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/enums/RoleIndexConfigEnum.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/AutoPoiConfig.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/CorsFilterCondition.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/api/dto/message/BusTemplateMessageDTO.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerWater/service/ICheerWaterService.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/YouBianCodeUtil.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/service/AppletLoginService.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/IpUtils.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/DictQuery.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/api/dto/FileUploadDTO.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerRecharge/controller/CheerRechargeController.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/security/AbstractQueryBlackListHandler.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/base/controller/JeecgController.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/es/JeecgElasticsearchTemplate.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerRecharge/service/ICheerRechargeService.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/BrowserUtils.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/filters/JwtFilter.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/DySmsHelper.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/oConvertUtils.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/dynamic/db/DataSourceCachePool.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/MyClassLoader.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/dynamic/db/DbTypeUtils.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerWater/controller/CheerWaterController.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/api/vo/Result.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/service/ApiLoginService.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/WebMvcConfiguration.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerConf/entity/CheerConf.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/api/dto/message/TemplateDTO.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/HTMLUtils.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/oss/OssBootUtil.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/enums/ModuleType.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/util/JwtUtil.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/controller/HanHaiMemberController.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/security/entity/SecurityResp.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/DataBaseConstant.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/DateUtils.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/SymbolConstant.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/AutoLogAspect.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/ImportExcelUtil.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/DynamicDataSourceModel.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/util/JeecgDataAutorUtils.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/SysAnnmentTypeEnum.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/WebSocketConfig.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerRecharge/entity/CheerRecharge.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/Swagger2Config.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/ServiceNameConstants.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/WebsocketConst.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/ProvinceCityArea.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/RestTemplateConfig.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/SysUserCacheInfo.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerConf/service/ICheerConfService.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/service/impl/BaseCommonServiceImpl.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/sign/util/HttpUtils.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/sign/util/BodyReaderHttpServletRequestWrapper.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/DictModel.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/mapper/HanHaiMemberMapper.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/SysCategoryModel.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/AutoPoiDictConfig.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/enums/CgformEnum.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/mybatis/TenantContext.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/bean/HttpConf.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/thirdapp/ThirdAppConfig.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/BrowserType.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/sign/util/SignUtil.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/security/entity/MyKeyPair.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/JeeccgBaseConfig.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/service/impl/ApiLoginServiceImpl.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/sign/interceptor/SignAuthInterceptor.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/security/entity/SecurityReq.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/CommonConstant.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/api/dto/OnlineAuthDTO.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/es/QueryStringBuilder.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerRecharge/mapper/CheerRechargeMapper.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/thirdapp/ThirdAppTypeConfig.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/oss/OssConfiguration.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/service/BaseCommonService.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/filters/CustomShiroFilterFactoryBean.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/superSearch/ObjectParseUtil.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/PmsUtil.java

jeecg-boot-base/jeecg-boot-base-tools/jeecg-boot-base-tools.iml

@@ -15,6 +15,8 @@
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <excludeFolder url="file://$MODULE_DIR$/${project.build.directory}/classes" />
+      <excludeFolder url="file://$MODULE_DIR$/${project.build.directory}/test-classes" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
     <orderEntry type="inheritedJdk" />

jeecg-boot-base/jeecg-boot-base-tools/target/maven-archiver/pom.properties

@@ -1,3 +0,0 @@
-artifactId=jeecg-boot-base-tools
-groupId=org.jeecgframework.boot
-version=3.2.0

jeecg-boot-base/jeecg-boot-base-tools/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -1,15 +0,0 @@
-org/jeecg/common/modules/redis/writer/JeecgRedisCacheWriter.class
-org/jeecg/common/config/mqtoken/UserTokenContext.class
-org/jeecg/common/modules/redis/client/JeecgRedisClient.class
-org/jeecg/common/modules/redis/listener/JeecgRedisListener.class
-org/jeecg/common/util/SpringContextHolder.class
-org/jeecg/common/util/RedisUtil.class
-org/jeecg/common/config/CommonConfig.class
-org/jeecg/common/modules/redis/receiver/RedisReceiver.class
-org/jeecg/common/constant/CacheConstant.class
-org/jeecg/common/enums/SentinelErrorInfoEnum.class
-org/jeecg/common/modules/redis/config/RedisConfig.class
-org/jeecg/common/config/mqtoken/TransmitUserTokenFilter.class
-org/jeecg/common/annotation/RabbitComponent.class
-org/jeecg/common/constant/GlobalConstants.class
-org/jeecg/common/base/BaseMap.class

jeecg-boot-base/jeecg-boot-base-tools/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -1,15 +0,0 @@
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-tools/src/main/java/org/jeecg/common/config/CommonConfig.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-tools/src/main/java/org/jeecg/common/modules/redis/receiver/RedisReceiver.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-tools/src/main/java/org/jeecg/common/config/mqtoken/TransmitUserTokenFilter.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-tools/src/main/java/org/jeecg/common/modules/redis/writer/JeecgRedisCacheWriter.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-tools/src/main/java/org/jeecg/common/constant/GlobalConstants.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-tools/src/main/java/org/jeecg/common/base/BaseMap.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-tools/src/main/java/org/jeecg/common/annotation/RabbitComponent.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-tools/src/main/java/org/jeecg/common/constant/CacheConstant.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-tools/src/main/java/org/jeecg/common/util/SpringContextHolder.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-tools/src/main/java/org/jeecg/common/modules/redis/listener/JeecgRedisListener.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-tools/src/main/java/org/jeecg/common/enums/SentinelErrorInfoEnum.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-tools/src/main/java/org/jeecg/common/modules/redis/client/JeecgRedisClient.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-tools/src/main/java/org/jeecg/common/util/RedisUtil.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-tools/src/main/java/org/jeecg/common/modules/redis/config/RedisConfig.java
-/Applications/hanhai-object/hanhai-cheer-2600-2000-240822/hanhai-cheer-2600-2000-240822/jeecg-boot-base/jeecg-boot-base-tools/src/main/java/org/jeecg/common/config/mqtoken/UserTokenContext.java

jeecg-boot-base/jeecg-boot-base.iml

@@ -4,6 +4,8 @@
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/${project.build.directory}/classes" />
+      <excludeFolder url="file://$MODULE_DIR$/${project.build.directory}/test-classes" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
     <orderEntry type="inheritedJdk" />

jeecg-boot-module-system/jeecg-boot-module-system.iml

@@ -14,7 +14,9 @@
       <configuration>
         <setting name="validation-enabled" value="true" />
         <setting name="provider-name" value="Hibernate" />
-        <datasource-mapping />
+        <datasource-mapping>
+          <factory-entry name="jeecg-boot-module-system" />
+        </datasource-mapping>
         <naming-strategy-map />
       </configuration>
     </facet>
@@ -29,6 +31,8 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/${project.build.directory}/classes" />
+      <excludeFolder url="file://$MODULE_DIR$/${project.build.directory}/test-classes" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
     <orderEntry type="inheritedJdk" />

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/cheeroncontroller/CheerTwoController.java

@@ -0,0 +1,87 @@
+package org.jeecg.modules.api.cheeroncontroller;
+
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.modules.apiBean.OrderPayBean;
+import org.jeecg.modules.apiBean.OrderWaterPageBean;
+import org.jeecg.modules.apiservice.CheerTwoService;
+import org.jeecg.modules.bean.ShopOrderPageBean;
+import org.jeecg.modules.bean.ShopPageBean;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+@Api(tags="加油小程序-第二版升级相关接口")
+@RestController
+@RequestMapping("/cheer/two")
+@Slf4j
+public class CheerTwoController {
+
+    @Resource
+    private CheerTwoService cheerTwoService;
+
+    //获取加油站列表信息接口
+    @GetMapping(value = "/getGasStationList")
+    @ApiOperation(value="获取加油站列表信息接口", notes="获取加油站列表信息接口")
+    public Result<?> getGasStationList(ShopPageBean bean){
+        return cheerTwoService.getGasStationList( bean);
+    }
+
+    //根据加油站标识获取加油站充值套餐信息
+    @GetMapping(value = "/getRechargeList")
+    @ApiOperation(value="根据加油站标识获取加油站充值套餐信息", notes="根据加油站标识获取加油站充值套餐信息")
+    public Result<?> getRechargeList(ShopOrderPageBean bean){
+        return cheerTwoService.getRechargeList(bean);
+    }
+
+    //根据加油站标识获取相关配置信息
+    @GetMapping(value = "/getConfig")
+    @ApiOperation(value="根据加油站标识获取相关配置信息", notes="根据加油站标识获取相关配置信息")
+    public Result<?> getConfig(String shopId){
+        return cheerTwoService.getConfig(shopId);
+    }
+
+
+    //获取订单列表带分页
+    @GetMapping(value = "/getOrderWaterPage")
+    @ApiOperation(value="根据加油站标识获取相关配置信息", notes="根据加油站标识获取相关配置信息")
+    public Result<?> getOrderWaterPage(@RequestHeader("X-Access-Token") String token, OrderWaterPageBean bean){
+        return cheerTwoService.getOrderWaterPage(token, bean);
+    }
+
+
+
+    //获取加油流水订单
+    @ApiOperation(value="小程序-用户输入支付创建支付订单并且支付", notes="小程序-用户输入支付创建支付订单并且支付")
+    @PostMapping("/createOrderPay")
+    public Result<?> createOrderPay(@RequestHeader("X-Access-Token") String token, OrderPayBean bean){
+        return cheerTwoService.createOrderPay(token, bean);
+    }
+
+
+    //查询当前用户是否是管理员
+    @GetMapping(value = "/isAdmin")
+    @ApiOperation(value="查询当前用户是否是管理员", notes="查询当前用户是否是管理员")
+    public Result<?> isAdmin(@RequestHeader("X-Access-Token") String token){
+        return cheerTwoService.isAdmin(token);
+    }
+
+    //获取推广二维码
+    @GetMapping(value = "/getQrCode")
+    @ApiOperation(value="获取推广二维码", notes="获取推广二维码")
+    public Result<?> getQrCode(@RequestHeader("X-Access-Token") String token){
+        return cheerTwoService.getQrCode(token);
+    }
+
+
+    //支付回调
+    @PostMapping("/notify")
+    public Object createNotify(@RequestBody String requestBody){
+        return cheerTwoService.createNotify(requestBody);
+    }
+
+
+}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiBean/OrderPayBean.java

@@ -12,4 +12,9 @@ public class OrderPayBean {
     @ApiModelProperty(value = "支付金额" )
     private BigDecimal money;
 
+    /**加油站标识*/
+    @ApiModelProperty(value = "加油站标识" )
+    private String  shopId;
+
+
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiUtils/WxQrCodeVo.java

@@ -0,0 +1,16 @@
+package org.jeecg.modules.apiUtils;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel("微信小程序码")
+@Data
+public class WxQrCodeVo {
+    /**图片地址*/
+    @ApiModelProperty(value = "图片地址")
+    private String url;
+
+    @ApiModelProperty(value = "加油站名称")
+    private String name;
+}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiUtils/printUtil.java

@@ -22,79 +22,11 @@ public class printUtil {
 
 
     public static final String URL = "http://api.feieyun.cn/Api/Open/";//不需要修改
-
     public static final String USER = "1498259189@qq.com";//*必填*：账号名
     public static final String UKEY = "hKt4XF8Gnp4skcPn";//*必填*: 飞鹅云后台注册账号后生成的UKEY 【备注：这不是填打印机的KEY】
     public static final String SN = "222536940";//*必填*：打印机编号，必须要在管理后台里添加打印机或调用API接口添加之后，才能调用API
 
 
-    //**********测试时，打开下面注释掉方法的即可,更多接口文档信息,请访问官网开放平台查看**********
-    public static void main(String[] args) throws Exception{
-
-        //==================添加打印机接口（支持批量）==================
-        //***返回值JSON字符串***
-        //正确例子：{"msg":"ok","ret":0,"data":{"ok":["sn#key#remark#carnum","316500011#abcdefgh#快餐前台"],"no":["316500012#abcdefgh#快餐前台#13688889999  （错误：识别码不正确）"]},"serverExecutedTime":3}
-        //错误：{"msg":"参数错误 : 该帐号未注册.","ret":-2,"data":null,"serverExecutedTime":37}
-
-        //提示：打印机编号(必填) # 打印机识别码(必填) # 备注名称(选填) # 流量卡号码(选填)，多台打印机请换行（\n）添加新打印机信息，每次最多100行(台)。
-//        String snlist = "sn1#key1#remark1#carnum1\nsn2#key2#remark2#carnum2";
-//        String method = addprinter(snlist);
-//        System.out.println(method);
-
-
-
-        //==================方法1.小票机打印订单接口==================
-        //***返回值JSON字符串***
-        //成功：{"msg":"ok","ret":0,"data":"xxxxxxx_xxxxxxxx_xxxxxxxx","serverExecutedTime":5}
-        //失败：{"msg":"错误描述","ret":非0,"data":"null","serverExecutedTime":5}
-
-//        String method1 = print(SN);//该接口只能是小票机使用,如购买的是标签机请使用下面方法2，调用打印
-//        System.out.println(method1);
-
-
-
-        //==================方法2.标签机专用打印订单接口==================
-        //***返回值JSON字符串***
-        //成功：{"msg":"ok","ret":0,"data":"xxxxxxx_xxxxxxxx_xxxxxxxx","serverExecutedTime":5}
-        //失败：{"msg":"错误描述","ret":非0,"data":"null","serverExecutedTime":5}
-
-//			String method2 = printLabelMsg(SN);//打开注释调用标签机打印接口进行打印,该接口只能是标签机使用，其它型号打印机请勿使用该接口
-//			System.out.println(method2);
-
-
-
-        //===========方法3.查询某订单是否打印成功=============
-        //***返回值JSON字符串***
-        //成功：{"msg":"ok","ret":0,"data":true,"serverExecutedTime":2}//data:true为已打印,false为未打印
-        //失败：{"msg":"错误描述","ret":非0, "data":null,"serverExecutedTime":7}
-
-//			String orderid = "xxxxxxx_xxxxxxxx_xxxxxxxx";//订单ID，从方法1返回值data获取
-//			String method3 = queryOrderState(orderid);
-//			System.out.println(method3);
-
-
-
-        //===========方法4.查询指定打印机某天的订单详情============
-        //***返回值JSON字符串***
-        //成功：{"msg":"ok","ret":0,"data":{"print":6,"waiting":1},"serverExecutedTime":9}//print已打印，waiting为打印
-        //失败：{"msg":"错误描述","ret":非0,"data":"null","serverExecutedTime":5}
-
-//			String strdate = "2016-11-12";//注意时间格式为"yyyy-MM-dd"
-//			String method4 = queryOrderInfoByDate(SN,strdate);
-//			System.out.println(method4);
-
-
-
-        //===========方法5.查询打印机的状态==========================
-        //***返回值JSON字符串***
-        //成功：{"msg":"ok","ret":0,"data":"状态","serverExecutedTime":4}
-        //失败：{"msg":"错误描述","ret":非0,"data":"null","serverExecutedTime":5}
-
-//			String method5 = queryPrinterStatus(SN);
-//			System.out.println(method5);
-
-    }
-
     //打印账单
     public static void printBill(String content){
         //添加打印机

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiUtils/printUtilTwo.java

@@ -0,0 +1,501 @@
+package org.jeecg.modules.apiUtils;
+
+import org.apache.commons.codec.digest.DigestUtils;
+import org.apache.http.HttpEntity;
+import org.apache.http.NameValuePair;
+import org.apache.http.client.config.RequestConfig;
+import org.apache.http.client.entity.UrlEncodedFormEntity;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.message.BasicNameValuePair;
+import org.apache.http.util.EntityUtils;
+
+import java.io.IOException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class printUtilTwo {
+
+
+    public static final String URL = "http://api.feieyun.cn/Api/Open/";//不需要修改
+    public static final String USER = "1498259189@qq.com";//*必填*：账号名
+    public static final String UKEY = "hKt4XF8Gnp4skcPn";//*必填*: 飞鹅云后台注册账号后生成的UKEY 【备注：这不是填打印机的KEY】
+    public static final String SN = "222539759";//*必填*：打印机编号，必须要在管理后台里添加打印机或调用API接口添加之后，才能调用API
+
+
+    //打印账单
+    public static void printBill(String content){
+        //添加打印机
+        String snlist = "222539759#6wrduvqn";
+        String method = addprinter(snlist);
+        System.out.println(method);
+
+        //打印账单
+        String method1 = print(SN, content);//该接口只能是小票机使用,如购买的是标签机请使用下面方法2，调用打印
+        System.out.println(method1);
+    }
+
+    //拼接打印信息
+    public static String spellMessage(String name, String oldMoney, String money,String title,String price){
+        String content;
+
+        //获取当前时间年月日 时分秒
+        Date date = new Date();
+        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        String now = df.format(date);
+
+
+        content = "加油小票 佳通车队<BR>";
+        content += "--------------------------------<BR>";
+        content += "消费日期 ："+now +"<BR><BR>";
+        content += "会员姓名 ："+name+"<BR><BR>";
+        content += "加油金额 ："+oldMoney+"元<BR><BR>";
+        content += "实收金额 ："+money+"元<BR><BR>";
+        content += "油品名称 ："+title+"<BR><BR>";
+        content += "加油单价 ："+price+"元/升<BR><BR>";
+        content += "--------------------------------<BR>";
+        content += "谢谢惠顾<BR>";
+
+        return content;
+    }
+
+
+
+
+    //=====================以下是函数实现部分================================================
+
+    private static String addprinter(String snlist){
+
+        //通过POST请求，发送打印信息到服务器
+        RequestConfig requestConfig = RequestConfig.custom()
+                .setSocketTimeout(30000)//读取超时
+                .setConnectTimeout(30000)//连接超时
+                .build();
+
+        CloseableHttpClient httpClient = HttpClients.custom()
+                .setDefaultRequestConfig(requestConfig)
+                .build();
+
+        HttpPost post = new HttpPost(URL);
+        List<NameValuePair> nvps = new ArrayList<NameValuePair>();
+        nvps.add(new BasicNameValuePair("user",USER));
+        String STIME = String.valueOf(System.currentTimeMillis()/1000);
+        nvps.add(new BasicNameValuePair("stime",STIME));
+        nvps.add(new BasicNameValuePair("sig",signature(USER,UKEY,STIME)));
+        nvps.add(new BasicNameValuePair("apiname","Open_printerAddlist"));//固定值,不需要修改
+        nvps.add(new BasicNameValuePair("printerContent",snlist));
+
+        CloseableHttpResponse response = null;
+        String result = null;
+        try
+        {
+            post.setEntity(new UrlEncodedFormEntity(nvps,"utf-8"));
+            response = httpClient.execute(post);
+            int statecode = response.getStatusLine().getStatusCode();
+            if(statecode == 200){
+                HttpEntity httpentity = response.getEntity();
+                if (httpentity != null){
+                    result = EntityUtils.toString(httpentity);
+                }
+            }
+        }
+        catch (Exception e)
+        {
+            e.printStackTrace();
+        }
+        finally{
+            try {
+                if(response!=null){
+                    response.close();
+                }
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+            try {
+                post.abort();
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+            try {
+                httpClient.close();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+        return result;
+
+    }
+
+
+    //方法1
+    private static String print(String sn, String content){
+        //标签说明：
+        //单标签:
+        //"<BR>"为换行,"<CUT>"为切刀指令(主动切纸,仅限切刀打印机使用才有效果)
+        //"<LOGO>"为打印LOGO指令(前提是预先在机器内置LOGO图片),"<PLUGIN>"为钱箱或者外置音响指令
+        //成对标签：
+        //"<CB></CB>"为居中放大一倍,"<B></B>"为放大一倍,"<C></C>"为居中,<L></L>字体变高一倍
+        //<W></W>字体变宽一倍,"<QR></QR>"为二维码,"<BOLD></BOLD>"为字体加粗,"<RIGHT></RIGHT>"为右对齐
+        //拼凑订单内容时可参考如下格式
+        //根据打印纸张的宽度，自行调整内容的格式，可参考下面的样例格式
+
+//        String content;
+//
+//        content = "加油小票 欢迎光临<BR><BR>";
+//        content += "--------------------------------<BR><BR>";
+//        content += "消费日期 ：2024/8/30 15:26:11<BR><BR>";
+//        content += "会员姓名 ：佳通车队<BR><BR>";
+//        content += "加油金额 ：200元<BR><BR>";
+//        content += "实收金额 ：180元<BR><BR>";
+//        content += "油品名称 ：95号汽油<BR><BR>";
+//        content += "加油单价 ：7.02元/升<BR><BR>";
+//        content += "--------------------------------<BR><BR>";
+//        content += "谢谢惠顾<BR><BR>";
+
+        //通过POST请求，发送打印信息到服务器
+        RequestConfig requestConfig = RequestConfig.custom()
+                .setSocketTimeout(30000)//读取超时
+                .setConnectTimeout(30000)//连接超时
+                .build();
+
+        CloseableHttpClient httpClient = HttpClients.custom()
+                .setDefaultRequestConfig(requestConfig)
+                .build();
+
+        HttpPost post = new HttpPost(URL);
+        List<NameValuePair> nvps = new ArrayList<NameValuePair>();
+        nvps.add(new BasicNameValuePair("user",USER));
+        String STIME = String.valueOf(System.currentTimeMillis()/1000);
+        nvps.add(new BasicNameValuePair("stime",STIME));
+        nvps.add(new BasicNameValuePair("sig",signature(USER,UKEY,STIME)));
+        nvps.add(new BasicNameValuePair("apiname","Open_printMsg"));//固定值,不需要修改
+        nvps.add(new BasicNameValuePair("sn",sn));
+        nvps.add(new BasicNameValuePair("content",content));
+        nvps.add(new BasicNameValuePair("times","1"));//打印联数
+
+        CloseableHttpResponse response = null;
+        String result = null;
+        try
+        {
+            post.setEntity(new UrlEncodedFormEntity(nvps,"utf-8"));
+            response = httpClient.execute(post);
+            int statecode = response.getStatusLine().getStatusCode();
+            if(statecode == 200){
+                HttpEntity httpentity = response.getEntity();
+                if (httpentity != null){
+                    //服务器返回的JSON字符串，建议要当做日志记录起来
+                    result = EntityUtils.toString(httpentity);
+                }
+            }
+        }
+        catch (Exception e)
+        {
+            e.printStackTrace();
+        }
+        finally{
+            try {
+                if(response!=null){
+                    response.close();
+                }
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+            try {
+                post.abort();
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+            try {
+                httpClient.close();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+        return result;
+
+    }
+
+
+
+    //方法2
+    private static String printLabelMsg(String sn){
+
+        String content;
+        content = "<DIRECTION>1</DIRECTION>";//设定打印时出纸和打印字体的方向，n 0 或 1，每次设备重启后都会初始化为 0 值设置，1：正向出纸，0：反向出纸，
+        content += "<TEXT x='9' y='10' font='12' w='1' h='2' r='0'>#001       五号桌      1/3</TEXT><TEXT x='80' y='80' font='12' w='2' h='2' r='0'>可乐鸡翅</TEXT><TEXT x='9' y='180' font='12' w='1' h='1' r='0'>张三先生       13800138000</TEXT>";//40mm宽度标签纸打印例子，打开注释调用标签打印接口打印
+
+        //通过POST请求，发送打印信息到服务器
+        RequestConfig requestConfig = RequestConfig.custom()
+                .setSocketTimeout(30000)//读取超时
+                .setConnectTimeout(30000)//连接超时
+                .build();
+
+        CloseableHttpClient httpClient = HttpClients.custom()
+                .setDefaultRequestConfig(requestConfig)
+                .build();
+
+        HttpPost post = new HttpPost(URL);
+        List<NameValuePair> nvps = new ArrayList<NameValuePair>();
+        nvps.add(new BasicNameValuePair("user",USER));
+        String STIME = String.valueOf(System.currentTimeMillis()/1000);
+        nvps.add(new BasicNameValuePair("stime",STIME));
+        nvps.add(new BasicNameValuePair("sig",signature(USER,UKEY,STIME)));
+        nvps.add(new BasicNameValuePair("apiname","Open_printLabelMsg"));//固定值,不需要修改
+        nvps.add(new BasicNameValuePair("sn",sn));
+        nvps.add(new BasicNameValuePair("content",content));
+        nvps.add(new BasicNameValuePair("times","1"));//打印联数
+
+        CloseableHttpResponse response = null;
+        String result = null;
+        try
+        {
+            post.setEntity(new UrlEncodedFormEntity(nvps,"utf-8"));
+            response = httpClient.execute(post);
+            int statecode = response.getStatusLine().getStatusCode();
+            if(statecode == 200){
+                HttpEntity httpentity = response.getEntity();
+                if (httpentity != null){
+                    //服务器返回的JSON字符串，建议要当做日志记录起来
+                    result = EntityUtils.toString(httpentity);
+                }
+            }
+        }
+        catch (Exception e)
+        {
+            e.printStackTrace();
+        }
+        finally{
+            try {
+                if(response!=null){
+                    response.close();
+                }
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+            try {
+                post.abort();
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+            try {
+                httpClient.close();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+        return result;
+
+    }
+
+
+    //方法3
+    private static String queryOrderState(String orderid){
+
+        //通过POST请求，发送打印信息到服务器
+        RequestConfig requestConfig = RequestConfig.custom()
+                .setSocketTimeout(30000)//读取超时
+                .setConnectTimeout(30000)//连接超时
+                .build();
+
+        CloseableHttpClient httpClient = HttpClients.custom()
+                .setDefaultRequestConfig(requestConfig)
+                .build();
+
+        HttpPost post = new HttpPost(URL);
+        List<NameValuePair> nvps = new ArrayList<NameValuePair>();
+        nvps.add(new BasicNameValuePair("user",USER));
+        String STIME = String.valueOf(System.currentTimeMillis()/1000);
+        nvps.add(new BasicNameValuePair("stime",STIME));
+        nvps.add(new BasicNameValuePair("sig",signature(USER,UKEY,STIME)));
+        nvps.add(new BasicNameValuePair("apiname","Open_queryOrderState"));//固定值,不需要修改
+        nvps.add(new BasicNameValuePair("orderid",orderid));
+
+        CloseableHttpResponse response = null;
+        String result = null;
+        try
+        {
+            post.setEntity(new UrlEncodedFormEntity(nvps,"utf-8"));
+            response = httpClient.execute(post);
+            int statecode = response.getStatusLine().getStatusCode();
+            if(statecode == 200){
+                HttpEntity httpentity = response.getEntity();
+                if (httpentity != null){
+                    //服务器返回
+                    result = EntityUtils.toString(httpentity);
+                }
+            }
+        }
+        catch (Exception e)
+        {
+            e.printStackTrace();
+        }
+        finally{
+            try {
+                if(response!=null){
+                    response.close();
+                }
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+            try {
+                post.abort();
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+            try {
+                httpClient.close();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+        return result;
+
+    }
+
+
+
+    //方法4
+    private static String queryOrderInfoByDate(String sn,String strdate){
+
+        //通过POST请求，发送打印信息到服务器
+        RequestConfig requestConfig = RequestConfig.custom()
+                .setSocketTimeout(30000)//读取超时
+                .setConnectTimeout(30000)//连接超时
+                .build();
+
+        CloseableHttpClient httpClient = HttpClients.custom()
+                .setDefaultRequestConfig(requestConfig)
+                .build();
+
+        HttpPost post = new HttpPost(URL);
+        List<NameValuePair> nvps = new ArrayList<NameValuePair>();
+        nvps.add(new BasicNameValuePair("user",USER));
+        String STIME = String.valueOf(System.currentTimeMillis()/1000);
+        nvps.add(new BasicNameValuePair("stime",STIME));
+        nvps.add(new BasicNameValuePair("sig",signature(USER,UKEY,STIME)));
+        nvps.add(new BasicNameValuePair("apiname","Open_queryOrderInfoByDate"));//固定值,不需要修改
+        nvps.add(new BasicNameValuePair("sn",sn));
+        nvps.add(new BasicNameValuePair("date",strdate));//yyyy-MM-dd格式
+
+        CloseableHttpResponse response = null;
+        String result = null;
+        try
+        {
+            post.setEntity(new UrlEncodedFormEntity(nvps,"utf-8"));
+            response = httpClient.execute(post);
+            int statecode = response.getStatusLine().getStatusCode();
+            if(statecode == 200){
+                HttpEntity httpentity = response.getEntity();
+                if (httpentity != null){
+                    //服务器返回
+                    result = EntityUtils.toString(httpentity);
+                }
+            }
+        }
+        catch (Exception e)
+        {
+            e.printStackTrace();
+        }
+        finally{
+            try {
+                if(response!=null){
+                    response.close();
+                }
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+            try {
+                post.abort();
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+            try {
+                httpClient.close();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+        return result;
+
+    }
+
+
+
+    //方法5
+    private static String queryPrinterStatus(String sn){
+
+        //通过POST请求，发送打印信息到服务器
+        RequestConfig requestConfig = RequestConfig.custom()
+                .setSocketTimeout(30000)//读取超时
+                .setConnectTimeout(30000)//连接超时
+                .build();
+
+        CloseableHttpClient httpClient = HttpClients.custom()
+                .setDefaultRequestConfig(requestConfig)
+                .build();
+
+        HttpPost post = new HttpPost(URL);
+        List<NameValuePair> nvps = new ArrayList<NameValuePair>();
+        nvps.add(new BasicNameValuePair("user",USER));
+        String STIME = String.valueOf(System.currentTimeMillis()/1000);
+        nvps.add(new BasicNameValuePair("stime",STIME));
+        nvps.add(new BasicNameValuePair("sig",signature(USER,UKEY,STIME)));
+        nvps.add(new BasicNameValuePair("apiname","Open_queryPrinterStatus"));//固定值,不需要修改
+        nvps.add(new BasicNameValuePair("sn",sn));
+
+        CloseableHttpResponse response = null;
+        String result = null;
+        try
+        {
+            post.setEntity(new UrlEncodedFormEntity(nvps,"utf-8"));
+            response = httpClient.execute(post);
+            int statecode = response.getStatusLine().getStatusCode();
+            if(statecode == 200){
+                HttpEntity httpentity = response.getEntity();
+                if (httpentity != null){
+                    //服务器返回
+                    result = EntityUtils.toString(httpentity);
+                }
+            }
+        }
+        catch (Exception e)
+        {
+            e.printStackTrace();
+        }
+        finally{
+            try {
+                if(response!=null){
+                    response.close();
+                }
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+            try {
+                post.abort();
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+            try {
+                httpClient.close();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+        return result;
+
+    }
+
+
+    //生成签名字符串
+    private static String signature(String USER,String UKEY,String STIME){
+        String s = DigestUtils.sha1Hex(USER+UKEY+STIME);
+        return s;
+    }
+
+
+
+}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiUtils/printUtils.java

@@ -0,0 +1,476 @@
+package org.jeecg.modules.apiUtils;
+
+import org.apache.commons.codec.digest.DigestUtils;
+import org.apache.http.HttpEntity;
+import org.apache.http.NameValuePair;
+import org.apache.http.client.config.RequestConfig;
+import org.apache.http.client.entity.UrlEncodedFormEntity;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.message.BasicNameValuePair;
+import org.apache.http.util.EntityUtils;
+
+import java.io.IOException;
+import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class printUtils {
+
+
+
+    public static final String URL = "http://api.feieyun.cn/Api/Open/";//不需要修改
+    public static final String USER = "1498259189@qq.com";//*必填*：账号名
+    public static final String UKEY = "hKt4XF8Gnp4skcPn";//*必填*: 飞鹅云后台注册账号后生成的UKEY 【备注：这不是填打印机的KEY】
+    public static final String SN = "222539759";//*必填*：打印机编号，必须要在管理后台里添加打印机或调用API接口添加之后，才能调用API
+
+
+    //打印账单 - 多门店数据库配置版本
+    public static void printBill(String content,String sn,String snlist,String url,String user,String ukey){
+        String method = addprinter(snlist,URL,USER,UKEY);
+        System.out.println(method);
+        //打印账单
+        String method1 = print(SN,content,URL,USER,UKEY);
+        System.out.println(method1);
+    }
+
+
+    //拼接打印信息
+    public static String spellMessage(String name, String oldMoney, String money, String title, BigDecimal price){
+        String content;
+
+        //获取当前时间年月日 时分秒
+        Date date = new Date();
+        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        String now = df.format(date);
+
+
+        content = "加油小票 佳通车队<BR>";
+        content += "--------------------------------<BR>";
+        content += "消费日期 ："+now +"<BR><BR>";
+        content += "会员姓名 ："+name+"<BR><BR>";
+        content += "加油金额 ："+oldMoney+"元<BR><BR>";
+        content += "实收金额 ："+money+"元<BR><BR>";
+        content += "油品名称 ："+title+"<BR><BR>";
+        content += "加油单价 ："+price+"元/升<BR><BR>";
+        content += "--------------------------------<BR>";
+        content += "谢谢惠顾<BR>";
+
+        return content;
+    }
+
+
+
+
+    //=====================以下是函数实现部分================================================
+
+    private static String addprinter(String snlist,String url,String user,String ukey){
+        //通过POST请求，发送打印信息到服务器
+        RequestConfig requestConfig = RequestConfig.custom()
+                .setSocketTimeout(30000)//读取超时
+                .setConnectTimeout(30000)//连接超时
+                .build();
+
+        CloseableHttpClient httpClient = HttpClients.custom()
+                .setDefaultRequestConfig(requestConfig)
+                .build();
+
+        HttpPost post = new HttpPost(url);
+        List<NameValuePair> nvps = new ArrayList<NameValuePair>();
+        nvps.add(new BasicNameValuePair("user",user));
+        String STIME = String.valueOf(System.currentTimeMillis()/1000);
+        nvps.add(new BasicNameValuePair("stime",STIME));
+        nvps.add(new BasicNameValuePair("sig",signature(user,ukey,STIME)));
+        nvps.add(new BasicNameValuePair("apiname","Open_printerAddlist"));//固定值,不需要修改
+        nvps.add(new BasicNameValuePair("printerContent",snlist));
+
+        CloseableHttpResponse response = null;
+        String result = null;
+        try
+        {
+            post.setEntity(new UrlEncodedFormEntity(nvps,"utf-8"));
+            response = httpClient.execute(post);
+            int statecode = response.getStatusLine().getStatusCode();
+            if(statecode == 200){
+                HttpEntity httpentity = response.getEntity();
+                if (httpentity != null){
+                    result = EntityUtils.toString(httpentity);
+                }
+            }
+        }
+        catch (Exception e)
+        {
+            e.printStackTrace();
+        }
+        finally{
+            try {
+                if(response!=null){
+                    response.close();
+                }
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+            try {
+                post.abort();
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+            try {
+                httpClient.close();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+        return result;
+
+    }
+
+
+    //方法1
+    private static String print(String sn, String content,String url,String user,String ukey){
+        //通过POST请求，发送打印信息到服务器
+        RequestConfig requestConfig = RequestConfig.custom()
+                .setSocketTimeout(30000)//读取超时
+                .setConnectTimeout(30000)//连接超时
+                .build();
+
+        CloseableHttpClient httpClient = HttpClients.custom()
+                .setDefaultRequestConfig(requestConfig)
+                .build();
+
+        HttpPost post = new HttpPost(url);
+        List<NameValuePair> nvps = new ArrayList<NameValuePair>();
+        nvps.add(new BasicNameValuePair("user",user));
+        String STIME = String.valueOf(System.currentTimeMillis()/1000);
+        nvps.add(new BasicNameValuePair("stime",STIME));
+        nvps.add(new BasicNameValuePair("sig",signature(ukey,ukey,STIME)));
+        nvps.add(new BasicNameValuePair("apiname","Open_printMsg"));//固定值,不需要修改
+        nvps.add(new BasicNameValuePair("sn",sn));
+        nvps.add(new BasicNameValuePair("content",content));
+        nvps.add(new BasicNameValuePair("times","1"));//打印联数
+
+        CloseableHttpResponse response = null;
+        String result = null;
+        try
+        {
+            post.setEntity(new UrlEncodedFormEntity(nvps,"utf-8"));
+            response = httpClient.execute(post);
+            int statecode = response.getStatusLine().getStatusCode();
+            if(statecode == 200){
+                HttpEntity httpentity = response.getEntity();
+                if (httpentity != null){
+                    //服务器返回的JSON字符串，建议要当做日志记录起来
+                    result = EntityUtils.toString(httpentity);
+                }
+            }
+        }
+        catch (Exception e)
+        {
+            e.printStackTrace();
+        }
+        finally{
+            try {
+                if(response!=null){
+                    response.close();
+                }
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+            try {
+                post.abort();
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+            try {
+                httpClient.close();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+        return result;
+
+    }
+
+
+
+    //方法2
+    private static String printLabelMsg(String sn,String url,String user,String ukey){
+
+        String content;
+        content = "<DIRECTION>1</DIRECTION>";//设定打印时出纸和打印字体的方向，n 0 或 1，每次设备重启后都会初始化为 0 值设置，1：正向出纸，0：反向出纸，
+        content += "<TEXT x='9' y='10' font='12' w='1' h='2' r='0'>#001       五号桌      1/3</TEXT><TEXT x='80' y='80' font='12' w='2' h='2' r='0'>可乐鸡翅</TEXT><TEXT x='9' y='180' font='12' w='1' h='1' r='0'>张三先生       13800138000</TEXT>";//40mm宽度标签纸打印例子，打开注释调用标签打印接口打印
+
+        //通过POST请求，发送打印信息到服务器
+        RequestConfig requestConfig = RequestConfig.custom()
+                .setSocketTimeout(30000)//读取超时
+                .setConnectTimeout(30000)//连接超时
+                .build();
+
+        CloseableHttpClient httpClient = HttpClients.custom()
+                .setDefaultRequestConfig(requestConfig)
+                .build();
+
+        HttpPost post = new HttpPost(url);
+        List<NameValuePair> nvps = new ArrayList<NameValuePair>();
+        nvps.add(new BasicNameValuePair("user",user));
+        String STIME = String.valueOf(System.currentTimeMillis()/1000);
+        nvps.add(new BasicNameValuePair("stime",STIME));
+        nvps.add(new BasicNameValuePair("sig",signature(user,ukey,STIME)));
+        nvps.add(new BasicNameValuePair("apiname","Open_printLabelMsg"));//固定值,不需要修改
+        nvps.add(new BasicNameValuePair("sn",sn));
+        nvps.add(new BasicNameValuePair("content",content));
+        nvps.add(new BasicNameValuePair("times","1"));//打印联数
+
+        CloseableHttpResponse response = null;
+        String result = null;
+        try
+        {
+            post.setEntity(new UrlEncodedFormEntity(nvps,"utf-8"));
+            response = httpClient.execute(post);
+            int statecode = response.getStatusLine().getStatusCode();
+            if(statecode == 200){
+                HttpEntity httpentity = response.getEntity();
+                if (httpentity != null){
+                    //服务器返回的JSON字符串，建议要当做日志记录起来
+                    result = EntityUtils.toString(httpentity);
+                }
+            }
+        }
+        catch (Exception e)
+        {
+            e.printStackTrace();
+        }
+        finally{
+            try {
+                if(response!=null){
+                    response.close();
+                }
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+            try {
+                post.abort();
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+            try {
+                httpClient.close();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+        return result;
+
+    }
+
+
+    //方法3
+    private static String queryOrderState(String orderid,String url,String user,String ukey){
+        //通过POST请求，发送打印信息到服务器
+        RequestConfig requestConfig = RequestConfig.custom()
+                .setSocketTimeout(30000)//读取超时
+                .setConnectTimeout(30000)//连接超时
+                .build();
+
+        CloseableHttpClient httpClient = HttpClients.custom()
+                .setDefaultRequestConfig(requestConfig)
+                .build();
+
+        HttpPost post = new HttpPost(url);
+        List<NameValuePair> nvps = new ArrayList<NameValuePair>();
+        nvps.add(new BasicNameValuePair("user",user));
+        String STIME = String.valueOf(System.currentTimeMillis()/1000);
+        nvps.add(new BasicNameValuePair("stime",STIME));
+        nvps.add(new BasicNameValuePair("sig",signature(user,ukey,STIME)));
+        nvps.add(new BasicNameValuePair("apiname","Open_queryOrderState"));//固定值,不需要修改
+        nvps.add(new BasicNameValuePair("orderid",orderid));
+
+        CloseableHttpResponse response = null;
+        String result = null;
+        try
+        {
+            post.setEntity(new UrlEncodedFormEntity(nvps,"utf-8"));
+            response = httpClient.execute(post);
+            int statecode = response.getStatusLine().getStatusCode();
+            if(statecode == 200){
+                HttpEntity httpentity = response.getEntity();
+                if (httpentity != null){
+                    //服务器返回
+                    result = EntityUtils.toString(httpentity);
+                }
+            }
+        }
+        catch (Exception e)
+        {
+            e.printStackTrace();
+        }
+        finally{
+            try {
+                if(response!=null){
+                    response.close();
+                }
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+            try {
+                post.abort();
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+            try {
+                httpClient.close();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+        return result;
+
+    }
+
+
+
+    //方法4
+    private static String queryOrderInfoByDate(String sn,String strdate,String url,String user,String ukey){
+
+        //通过POST请求，发送打印信息到服务器
+        RequestConfig requestConfig = RequestConfig.custom()
+                .setSocketTimeout(30000)//读取超时
+                .setConnectTimeout(30000)//连接超时
+                .build();
+
+        CloseableHttpClient httpClient = HttpClients.custom()
+                .setDefaultRequestConfig(requestConfig)
+                .build();
+
+        HttpPost post = new HttpPost(url);
+        List<NameValuePair> nvps = new ArrayList<NameValuePair>();
+        nvps.add(new BasicNameValuePair("user",user));
+        String STIME = String.valueOf(System.currentTimeMillis()/1000);
+        nvps.add(new BasicNameValuePair("stime",STIME));
+        nvps.add(new BasicNameValuePair("sig",signature(user,ukey,STIME)));
+        nvps.add(new BasicNameValuePair("apiname","Open_queryOrderInfoByDate"));//固定值,不需要修改
+        nvps.add(new BasicNameValuePair("sn",sn));
+        nvps.add(new BasicNameValuePair("date",strdate));//yyyy-MM-dd格式
+
+        CloseableHttpResponse response = null;
+        String result = null;
+        try
+        {
+            post.setEntity(new UrlEncodedFormEntity(nvps,"utf-8"));
+            response = httpClient.execute(post);
+            int statecode = response.getStatusLine().getStatusCode();
+            if(statecode == 200){
+                HttpEntity httpentity = response.getEntity();
+                if (httpentity != null){
+                    //服务器返回
+                    result = EntityUtils.toString(httpentity);
+                }
+            }
+        }
+        catch (Exception e)
+        {
+            e.printStackTrace();
+        }
+        finally{
+            try {
+                if(response!=null){
+                    response.close();
+                }
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+            try {
+                post.abort();
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+            try {
+                httpClient.close();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+        return result;
+
+    }
+
+
+
+    //方法5
+    private static String queryPrinterStatus(String sn,String url,String user,String ukey){
+
+        //通过POST请求，发送打印信息到服务器
+        RequestConfig requestConfig = RequestConfig.custom()
+                .setSocketTimeout(30000)//读取超时
+                .setConnectTimeout(30000)//连接超时
+                .build();
+
+        CloseableHttpClient httpClient = HttpClients.custom()
+                .setDefaultRequestConfig(requestConfig)
+                .build();
+
+        HttpPost post = new HttpPost(url);
+        List<NameValuePair> nvps = new ArrayList<NameValuePair>();
+        nvps.add(new BasicNameValuePair("user",user));
+        String STIME = String.valueOf(System.currentTimeMillis()/1000);
+        nvps.add(new BasicNameValuePair("stime",STIME));
+        nvps.add(new BasicNameValuePair("sig",signature(user,ukey,STIME)));
+        nvps.add(new BasicNameValuePair("apiname","Open_queryPrinterStatus"));//固定值,不需要修改
+        nvps.add(new BasicNameValuePair("sn",sn));
+
+        CloseableHttpResponse response = null;
+        String result = null;
+        try
+        {
+            post.setEntity(new UrlEncodedFormEntity(nvps,"utf-8"));
+            response = httpClient.execute(post);
+            int statecode = response.getStatusLine().getStatusCode();
+            if(statecode == 200){
+                HttpEntity httpentity = response.getEntity();
+                if (httpentity != null){
+                    //服务器返回
+                    result = EntityUtils.toString(httpentity);
+                }
+            }
+        }
+        catch (Exception e)
+        {
+            e.printStackTrace();
+        }
+        finally{
+            try {
+                if(response!=null){
+                    response.close();
+                }
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+            try {
+                post.abort();
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+            try {
+                httpClient.close();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+        return result;
+
+    }
+
+
+    //生成签名字符串
+    private static String signature(String USER,String UKEY,String STIME){
+        String s = DigestUtils.sha1Hex(USER+UKEY+STIME);
+        return s;
+    }
+
+
+
+}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/CheerTwoService.java

@@ -0,0 +1,41 @@
+package org.jeecg.modules.apiservice;
+
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.modules.apiBean.OrderPayBean;
+import org.jeecg.modules.apiBean.OrderWaterPageBean;
+import org.jeecg.modules.bean.ShopOrderPageBean;
+import org.jeecg.modules.bean.ShopPageBean;
+import org.springframework.web.bind.annotation.RequestHeader;
+
+public interface CheerTwoService {
+
+    //获取加油站列表带分页
+    Result<?> getGasStationList(ShopPageBean bean);
+
+    //根据加油站标识获取加油站充值套餐信息
+    Result<?> getRechargeList( ShopOrderPageBean bean);
+
+    //根据加油站标识获取相关配置信息
+    Result<?> getConfig(String shopId);
+
+    //获取订单列表带分页
+    Result<?> getOrderWaterPage(String token, OrderWaterPageBean bean);
+
+    //加油小程序-用户输入支付创建支付订单并且支付
+    Result<?> createOrderPay(String token, OrderPayBean bean);
+
+    //查询当前用户是否是管理员
+    Result<?> isAdmin( String token);
+
+    //获取推广二维码
+    Result<?> getQrCode(String token);
+
+    //支付回调
+    Object createNotify(String requestBody);
+
+
+
+
+
+
+}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/impl/CheerTwoServiceImpl.java

@@ -0,0 +1,518 @@
+package org.jeecg.modules.apiservice.impl;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.TypeReference;
+import com.aliyun.oss.OSS;
+import com.aliyun.oss.OSSClientBuilder;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.github.binarywang.wxpay.bean.notify.WxPayOrderNotifyResult;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.fileupload.FileItem;
+import org.apache.commons.fileupload.disk.DiskFileItemFactory;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.util.RedisUtil;
+import org.jeecg.config.shiro.ShiroRealm;
+import org.jeecg.modules.apiBean.OrderPayBean;
+import org.jeecg.modules.apiBean.OrderWaterPageBean;
+import org.jeecg.modules.apiUtils.HttpClientUtil;
+import org.jeecg.modules.apiUtils.WxQrCodeVo;
+import org.jeecg.modules.apiUtils.printUtil;
+import org.jeecg.modules.apiUtils.printUtils;
+import org.jeecg.modules.apiUtils.printUtilTwo;
+import org.jeecg.modules.apiservice.CheerTwoService;
+import org.jeecg.modules.bean.ShopOrderPageBean;
+import org.jeecg.modules.bean.ShopPageBean;
+import org.jeecg.modules.cheerAdmin.entity.CheerAdmin;
+import org.jeecg.modules.cheerAdmin.service.ICheerAdminService;
+import org.jeecg.modules.cheerConf.entity.CheerConf;
+import org.jeecg.modules.cheerConf.service.ICheerConfService;
+import org.jeecg.modules.cheerPrinter.entity.CheerPrinter;
+import org.jeecg.modules.cheerPrinter.service.ICheerPrinterService;
+import org.jeecg.modules.cheerRecharge.entity.CheerRecharge;
+import org.jeecg.modules.cheerRecharge.service.ICheerRechargeService;
+import org.jeecg.modules.cheerShop.entity.CheerShop;
+import org.jeecg.modules.cheerShop.service.ICheerShopService;
+import org.jeecg.modules.cheerWater.entity.CheerWater;
+import org.jeecg.modules.cheerWater.service.ICheerWaterService;
+import org.jeecg.modules.hanHaiMember.entity.HanHaiMember;
+import org.jeecg.modules.hanHaiMember.service.IHanHaiMemberService;
+import org.jeecg.modules.pay.MpWxPayService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Service;
+import org.springframework.util.LinkedMultiValueMap;
+import org.springframework.util.MultiValueMap;
+import org.springframework.web.client.RestTemplate;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.commons.CommonsMultipartFile;
+
+import javax.annotation.Resource;
+import java.io.*;
+import java.math.BigDecimal;
+import java.util.*;
+
+@Service
+@Slf4j
+public class CheerTwoServiceImpl implements CheerTwoService {
+    //权限验证
+    @Resource
+    private ShiroRealm shiroRealm;
+    //获取加油站信息
+    @Resource
+    private ICheerShopService cheerShopService;
+    @Resource
+    private ICheerPrinterService cheerPrinterService;
+    @Resource
+    private ICheerRechargeService cheerRechargeService;
+    @Resource
+    private ICheerWaterService cheerWaterService;
+    @Resource
+    private ICheerAdminService cheerAdminService;
+    @Resource
+    private ICheerConfService cheerConfService;
+    //支付接口
+    @Autowired
+    private MpWxPayService mpWxPayService;
+    //缓存记录
+    @Resource
+    private RedisUtil redisUtil;
+    @Value("${wechat.mpAppId}")
+    private String appid;
+    @Value("${wechat.mpAppSecret}")
+    private String secret;
+    @Value("${jeecg.oss.endpoint}")
+    private String endpoint;
+    @Value("${jeecg.oss.accessKey}")
+    private String accessKey;
+    @Value("${jeecg.oss.secretKey}")
+    private String secretKey;
+    @Value("${jeecg.oss.bucketName}")
+    private String bucketName;
+
+    //获取个人信息接口
+    @Resource
+    private IHanHaiMemberService hanHaiMemberService;
+
+
+    //获取加油站列表带分页
+    @Override
+    public Result<?> getGasStationList(ShopPageBean bean){
+
+        Page<CheerShop> page = new Page<CheerShop>(bean.getPageNo(), bean.getPageSize());
+        Page<CheerShop> page1 = cheerShopService.lambdaQuery()
+                .eq(CheerShop::getIsOpen, "Y")
+                .page(page);
+        return Result.OK("加油站列表数据",page1);
+    }
+
+
+    //根据加油站标识获取加油站充值套餐信息
+    @Override
+    public Result<?> getRechargeList(ShopOrderPageBean bean){
+
+        Page<CheerRecharge> page = new Page<CheerRecharge>(bean.getPageNo(), bean.getPageSize());
+        Page<CheerRecharge> page1 = cheerRechargeService.lambdaQuery()
+                .eq(CheerRecharge::getShopId, bean.getId())
+                .page(page);
+        return Result.OK("加油站充值套餐信息",page1);
+    }
+
+
+
+    //根据加油站标识获取相关配置信息
+    @Override
+    public Result<?> getConfig(String shopId){
+        CheerShop byId = cheerShopService.getById(shopId);
+        return Result.OK("配置信息",byId);
+    }
+
+
+    //获取订单列表带分页
+    @Override
+    public Result<?> getOrderWaterPage(String token, OrderWaterPageBean bean){
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+        Page<CheerWater> page = new Page<CheerWater>(bean.getPageNo(), bean.getPageSize());
+        Page<CheerWater> page1 = cheerWaterService.lambdaQuery()
+                .eq(CheerWater::getUserId, hanHaiMember.getId())
+                .eq(CheerWater::getState, "1")
+                .orderByDesc(CheerWater::getCreateTime)
+                .page(page);
+        //获取当前订单信息
+        List<CheerWater> records = page1.getRecords();
+        //创建新的集合
+        List<CheerWater> newList = new ArrayList<>();
+        for (CheerWater cheerWater : records) {
+            CheerShop cheerShop = cheerShopService.getById(cheerWater.getShopId());
+            cheerWater.setShopId(cheerShop.getName());
+            newList.add(cheerWater);
+        }
+        page1.setRecords(newList);
+        return Result.OK("加油流水",page1);
+    }
+
+
+
+
+    //加油小程序-用户输入支付创建支付订单并且支付
+    @Override
+    public Result<?> createOrderPay(String token, OrderPayBean bean){
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+        //当前加油站未配置打印机
+        CheerShop byId = cheerShopService.getById(bean.getShopId());
+        //根据打印机标识查询是否有打印机
+        CheerPrinter byId1 = cheerPrinterService.getById(byId.getPrinterId());
+        if(byId1 == null){
+            return Result.error("当前加油站未配置打印机");
+        }
+
+
+
+        //判断输入金额是否为空
+        if(bean.getMoney() == null){
+            return Result.error("支付金额不能为空");
+        }
+        //判断加油站标识不能为空
+        if(bean.getShopId() == null){
+            return Result.error("加油站标识不能为空");
+        }
+        //根据加油站标识查询相关信息
+        CheerShop cheerShop = cheerShopService.getById(bean.getShopId());
+        //判断当前信息不能为空
+        if(cheerShop == null){
+            return Result.error("加油站信息不存在");
+        }
+        if(cheerShop.getIsOpen().equals("N")){
+            return Result.error("当前加油站已关闭");
+        }
+        BigDecimal oldMoney = bean.getMoney();
+        //支付金额不能为0
+        if(bean.getMoney().compareTo(new BigDecimal(0)) == 0){
+            return Result.error("支付金额不能为0");
+        }
+        //支付金额不能为负数
+        if(bean.getMoney().compareTo(new BigDecimal(0)) == -1){
+            return Result.error("支付金额不能为负数");
+        }
+        //获取当前折扣
+        BigDecimal discount = cheerShop.getPreferential();
+        //保留小数点后两位
+        BigDecimal money = bean.getMoney().divide(discount).setScale(2, BigDecimal.ROUND_HALF_UP);
+
+        //创建订单流水
+        CheerWater cheerWater = new CheerWater();
+        cheerWater.setShopId(bean.getShopId());
+        cheerWater.setUserId(hanHaiMember.getId());
+        cheerWater.setOldPrice(money);
+        cheerWater.setPrice(oldMoney);
+        cheerWater.setState("0");
+        cheerWater.setCreateTime(new Date());
+        cheerWater.setName(cheerShop.getTitle());
+        cheerWater.setUserHead(hanHaiMember.getHeadImage());
+        cheerWaterService.save(cheerWater);
+
+
+
+        //吊起微信支付
+        String s = bean.getMoney().multiply(new BigDecimal(100)).toString();
+        int i1 = Double.valueOf(s).intValue();
+        Object appOrder = mpWxPayService.createOrderGo(
+                "购买"+cheerWater.getName() ,
+                "127.0.0.1",
+                cheerWater.getId(),
+                i1,
+                cheerWater.getId(),
+                hanHaiMember.getAppletOpenid(),
+                cheerWater.toString());
+
+
+
+        return Result.OK("支付成功",appOrder);
+    }
+
+
+
+    //查询当前用户是否是管理员
+    @Override
+    public Result<?> isAdmin( String token){
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+//        CheerAdmin one = cheerAdminService.lambdaQuery()
+//                .eq(CheerAdmin::getUserId, hanHaiMember.getId())
+//                .one();
+        CheerShop one = cheerShopService.lambdaQuery()
+                .eq(CheerShop::getUserId, hanHaiMember.getId())
+                .one();
+        return Result.OK(one);
+    }
+
+
+
+    //获取推广二维码
+    @Override
+    public Result<?> getQrCode(String token){
+        HanHaiMember member = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+        //根据用户标识查询用户是否是管理员
+        CheerAdmin one = cheerAdminService.lambdaQuery()
+                .eq(CheerAdmin::getUserId, member.getId())
+                .one();
+        if(one == null){
+            return Result.error("当前用户不是管理员");
+        }
+
+        WxQrCodeVo o = (WxQrCodeVo)redisUtil.get("CodeImage::" + member.getId());
+        if(o!=null){
+            CheerShop cheerShop = cheerShopService.lambdaQuery()
+                    .eq(CheerShop::getUserId, member.getId())
+                    .one();
+
+            o.setName(cheerShop.getName());
+            return Result.OK(o);
+        }
+//        LambdaQueryWrapper<DbConf> config = new LambdaQueryWrapper<>();
+//        config.eq(DbConf::getIsDel,0).eq(DbConf::getKeyValue,"xcxSharePage");
+//        DbConf one = confService.getOne(config);
+//        String xcxSharePage = one.getValue();
+        Map<String, Object> param = new HashMap<>();
+
+        CheerConf xcxSharePage = cheerConfService.lambdaQuery()
+                .eq(CheerConf::getKeyValue, "xcxSharePage")
+                .one();
+
+
+
+
+
+        String key = "shareId=" + one.getShopId();
+
+        param.put("path", xcxSharePage.getKeyCentent() + "?" + key); //跳转页面
+        String accessToken = this.getAccessToken();
+        RestTemplate rest = new RestTemplate();
+        InputStream inputStream = null;
+        OutputStream outputStream = null;
+        File file = null;
+
+//        LambdaQueryWrapper<DbConf> configImg = new LambdaQueryWrapper<>();
+//        configImg.eq(DbConf::getIsDel,0).eq(DbConf::getKeyValue,"codeImg");
+//        DbConf oneImg = confService.getOne(configImg);
+
+        CheerConf oneImage = cheerConfService.lambdaQuery()
+                .eq(CheerConf::getKeyValue, "codeImg")
+                .one();
+
+        String codeImg = oneImage.getKeyCentent();
+        try{
+            String url = "https://api.weixin.qq.com/wxa/getwxacode?access_token=" + accessToken;
+            param.put("scene", "");
+            param.put("width", 150);
+            param.put("auto_color", false);
+            Map<String, Object> line_color = new HashMap<>();
+            line_color.put("r", 0);
+            line_color.put("g", 0);
+            line_color.put("b", 0);
+            param.put("line_color", line_color);
+            MultiValueMap<String, String> headers = new LinkedMultiValueMap<>();
+            org.springframework.http.HttpEntity requestEntity = new org.springframework.http.HttpEntity(JSON.toJSONString(param), headers);
+            ResponseEntity<byte[]> entity = rest.exchange(url, HttpMethod.POST, requestEntity, byte[].class, new Object[0]);
+            byte[] result = entity.getBody();
+
+            inputStream = new ByteArrayInputStream(result);
+            String tempSave = codeImg;
+            String filePath = tempSave;
+            log.info("文件临时存储路径，{}", filePath);
+            file = new File(filePath);
+            if (!file.exists()) {
+                file.createNewFile();
+            }
+            outputStream = new FileOutputStream(file);
+            int len = 0;
+            byte[] buf = new byte[1024];
+            while ((len = inputStream.read(buf, 0, 1024)) != -1) {
+                outputStream.write(buf, 0, len);
+            }
+            outputStream.flush();
+            /**
+             * 将文件上传至阿里云
+             */
+            DiskFileItemFactory factory = new DiskFileItemFactory(16, null);
+            FileItem item = factory.createItem("File", "text/plain", true, file.getName());
+            int bytesRead = 0;
+            byte[] buffer = new byte[8192];
+            try {
+                FileInputStream fis = new FileInputStream(file);
+                OutputStream os = item.getOutputStream();
+                while ((bytesRead = fis.read(buffer, 0, 8192)) != -1) {
+                    os.write(buffer, 0, bytesRead);
+                }
+                os.close();
+                fis.close();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+            MultipartFile mf = new CommonsMultipartFile(item);
+            //返回图片下载地址
+            WxQrCodeVo wxCodeVo = new WxQrCodeVo();
+            wxCodeVo.setUrl(this.uploadAliYunOss(mf));
+
+
+            CheerShop cheerShop = cheerShopService.lambdaQuery()
+                    .eq(CheerShop::getUserId, member.getId())
+                    .one();
+
+
+            wxCodeVo.setName(cheerShop.getName());
+
+            redisUtil.set("CodeImage::"+member.getId(),wxCodeVo);
+            return Result.OK(wxCodeVo);
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+
+            if (inputStream != null) {
+                try {
+                    inputStream.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+            if (outputStream != null) {
+                try {
+                    outputStream.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+            //删除文件
+            if (file.exists()) {
+                file.delete();
+            }
+        }
+        return null;
+    }
+
+
+    /**
+     * 获取令牌
+     *
+     * @return
+     */
+    private String getAccessToken() {
+        String requestUrl = "https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid=" + appid + "&secret=" + secret;
+        String doGet2 = HttpClientUtil.doGet2(requestUrl);
+        Map<String, String> map = JSON.parseObject(doGet2, new TypeReference<Map<String, String>>() {
+        });
+        return map.get("access_token");
+    }
+    /**
+     * 上传文件至阿里云oss
+     *
+     * @return
+     */
+    private String uploadAliYunOss(MultipartFile mf) throws Exception {
+        String uploadFile = "WxCodeFile";
+        String fileName = new StringBuffer(mf.getOriginalFilename()).append(".jpg").toString();// 获取文件名
+        String dbpath = uploadFile + File.separator + fileName;
+        if (dbpath.contains("\\")) {
+            dbpath = dbpath.replace("\\", "/");
+        }
+        String endpoint = this.endpoint;
+        String accessKey = this.accessKey;
+        String secretKey = this.secretKey;
+        // 创建OSSClient实例。
+        OSS ossClient = new OSSClientBuilder().build(endpoint, accessKey, secretKey);
+        // 上传Byte数组。
+        byte[] content = mf.getBytes();
+        String bucketName = this.bucketName;
+        ossClient.putObject(bucketName, dbpath, new ByteArrayInputStream(content));
+        // 关闭OSSClient。
+        ossClient.shutdown();
+        return dbpath;
+    }
+
+
+
+    //支付回调
+    @Override
+    public Object createNotify(String requestBody){
+        WxPayOrderNotifyResult notify = mpWxPayService.notify(requestBody);
+
+        String outTradeNo = notify.getOutTradeNo();
+
+        //开始处理业务逻辑
+        CheerWater  byId = cheerWaterService.getById(outTradeNo);
+
+        if(byId!=null){
+            if(!byId.getState().equals("1")){
+                cheerWaterService.lambdaUpdate()
+                        .set(CheerWater::getState,"1")
+                        .eq(CheerWater::getId,outTradeNo)
+                        .update();
+
+                //根据流水中的用户标识查询用户信息
+                HanHaiMember hanHaiMember = hanHaiMemberService.getById(byId.getUserId());
+
+//                //根据配置信息获得当前单价
+//                CheerConf price = cheerConfService.lambdaQuery()
+//                        .eq(CheerConf::getKeyValue,"price")
+//                        .one();
+//
+//                //根据配置信息获得当前
+//                CheerConf title = cheerConfService.lambdaQuery()
+//                        .eq(CheerConf::getKeyValue,"title")
+//                        .one();
+//
+//                //获取配置中的打印次数
+//                CheerConf num = cheerConfService.lambdaQuery()
+//                        .eq(CheerConf::getKeyValue,"num")
+//                        .one();
+
+                //获取店铺信息
+                CheerShop cheerShop = cheerShopService.lambdaQuery()
+                        .eq(CheerShop::getId,byId.getShopId())
+                        .one();
+
+                //根据打印机标识获取打印机信息
+                CheerPrinter cheerPrinter = cheerPrinterService.lambdaQuery()
+                        .eq(CheerPrinter::getId,cheerShop.getPrinterId())
+                        .one();
+
+                //拼接打印信息
+                String content = printUtils.spellMessage(
+                        hanHaiMember.getNickName(),
+                        byId.getOldPrice().toString(),
+                        byId.getPrice().toString(),
+                        cheerShop.getTitle(),
+                        cheerShop.getPrice()
+                );
+
+                //客户要求打印两次
+                for (int i = 0; i < cheerShop.getNum(); i++){
+//                    System.out.println("打印第"+i+"次");
+//                    System.out.println("打印内容："+content);
+//                    System.out.println("打印机sn："+cheerPrinter.getSn());
+//                    System.out.println("打印机snList："+cheerPrinter.getSnList());
+//                    System.out.println("打印机url："+cheerPrinter.getUrl());
+//                    System.out.println("打印机user："+cheerPrinter.getUser());
+//                    System.out.println("打印机ukey："+cheerPrinter.getUserKey());
+
+                    if(cheerPrinter.getSn().equals("222539759")){
+                        printUtilTwo.printBill(content);
+                    }else{
+                        printUtil.printBill(content);
+                    }
+
+
+
+//                    printUtils.printBill(content,cheerPrinter.getSn(),cheerPrinter.getSnList(),cheerPrinter.getUrl(),cheerPrinter.getUser(),cheerPrinter.getUserKey());
+                }
+
+
+            }
+        }
+        return null;
+    }
+
+
+}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/bean/ShopOrderPageBean.java

@@ -0,0 +1,24 @@
+package org.jeecg.modules.bean;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class ShopOrderPageBean {
+
+    /**加油站标识*/
+    @ApiModelProperty(value = "加油站标识" )
+    private String  id;
+
+    /**显示条数*/
+    @ApiModelProperty(value = "显示条数" )
+    private Integer pageSize;
+    /**当前页*/
+    @ApiModelProperty(value = "当前页" )
+    private Integer pageNo;
+
+    public ShopOrderPageBean() {
+        this.pageNo = 1;
+        this.pageSize = 10;
+    }
+}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/bean/ShopPageBean.java

@@ -0,0 +1,20 @@
+package org.jeecg.modules.bean;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class ShopPageBean {
+
+    /**显示条数*/
+    @ApiModelProperty(value = "显示条数" )
+    private Integer pageSize;
+    /**当前页*/
+    @ApiModelProperty(value = "当前页" )
+    private Integer pageNo;
+
+    public ShopPageBean() {
+        this.pageNo = 1;
+        this.pageSize = 10;
+    }
+}

jeecg-boot-module-system/src/main/resources/application-dev.yml

@@ -1,5 +1,5 @@
 server:
-  port: 8002
+  port: 8000
   tomcat:
     max-swallow-size: -1
   error:
@@ -134,9 +134,9 @@ spring:
       #        connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
       datasource:
         master:
-          url: jdbc:mysql://47.120.64.83:3306/cheer-api?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai&autoReconnect=true&failOverReadOnly=false
+          url: jdbc:mysql://42.194.239.145:3306/cheer-api-two?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai&autoReconnect=true&failOverReadOnly=false
           username: root
-          password: n+~@kB_Z
+          password: I5+sHYZQ
           driver-class-name: com.mysql.cj.jdbc.Driver
           # 多数据源配置
           #multi-datasource1:
@@ -147,7 +147,7 @@ spring:
   #redis 配置
   redis:
     database: 2
-    host: 47.120.64.83
+    host: 42.194.239.145
     lettuce:
       pool:
         max-active: -1   #最大连接数据库连接数,设 -1 为没有限制
@@ -155,7 +155,7 @@ spring:
         max-wait: -1ms  #最大建立连接等待时间。如果超过此时间将接到异常。设为-1表示无限制。
         min-idle: 0     #最小等待连接中的数量,设 0 为没有限制
       shutdown-timeout: 1000ms
-    password: 'aq.888888'
+    password: 'lzx.123456'
     port: 6379
 #mybatis plus 设置
 mybatis-plus:
@@ -330,3 +330,11 @@ third-app:
       client-secret: ??
       agent-id: ??
 
+##配置微信
+wechat:
+  mpAppId: wxe337e285c449abfc
+  mpAppSecret: 45de69ce6709d05a233f7c9bfdc8a7ae
+  mchId: 1684003236
+  mchKey: 0fdb77429ffdf206c151af76a663041c
+  keyPath:
+  notifyUrl:

jeecg-boot-module-system/src/main/resources/application-prod.yml

@@ -0,0 +1,332 @@
+server:
+  port: 8002
+  tomcat:
+    max-swallow-size: -1
+  error:
+    include-exception: true
+    include-stacktrace: ALWAYS
+    include-message: ALWAYS
+  servlet:
+    context-path: /cheer-prod
+  compression:
+    enabled: true
+    min-response-size: 1024
+    mime-types: application/javascript,application/json,application/xml,text/html,text/xml,text/plain,text/css,image/*
+
+management:
+  endpoints:
+    web:
+      exposure:
+        include: metrics,httptrace
+
+spring:
+  servlet:
+    multipart:
+      max-file-size: 10MB
+      max-request-size: 10MB
+  mail:
+    host: smtp.qq.com
+    username:
+    password:
+    properties:
+      mail:
+        smtp:
+          auth: true
+          starttls:
+            enable: true
+            required: true
+  ## quartz定时任务,采用数据库方式
+  quartz:
+    job-store-type: jdbc
+    initialize-schema: embedded
+    #定时任务启动开关，true-开  false-关
+    auto-startup: true
+    #启动时更新己存在的Job
+    overwrite-existing-jobs: true
+    properties:
+      org:
+        quartz:
+          scheduler:
+            instanceName: MyScheduler
+            instanceId: AUTO
+          jobStore:
+            class: org.springframework.scheduling.quartz.LocalDataSourceJobStore
+            driverDelegateClass: org.quartz.impl.jdbcjobstore.StdJDBCDelegate
+            tablePrefix: QRTZ_
+            isClustered: true
+            misfireThreshold: 60000
+            clusterCheckinInterval: 10000
+          threadPool:
+            class: org.quartz.simpl.SimpleThreadPool
+            threadCount: 10
+            threadPriority: 5
+            threadsInheritContextClassLoaderOfInitializingThread: true
+  #json 时间戳统一转换
+  jackson:
+    date-format:   yyyy-MM-dd HH:mm:ss
+    time-zone:   GMT+8
+  jpa:
+    open-in-view: false
+  activiti:
+    check-process-definitions: false
+    #启用作业执行器
+    async-executor-activate: false
+    #启用异步执行器
+    job-executor-activate: false
+  aop:
+    proxy-target-class: true
+  #配置freemarker
+  freemarker:
+    # 设置模板后缀名
+    suffix: .ftl
+    # 设置文档类型
+    content-type: text/html
+    # 设置页面编码格式
+    charset: UTF-8
+    # 设置页面缓存
+    cache: false
+    prefer-file-system-access: false
+    # 设置ftl文件路径
+    template-loader-path:
+      - classpath:/templates
+  # 设置静态文件路径，js,css等
+  mvc:
+    static-path-pattern: /**
+    #Spring Boot 2.6+后映射匹配的默认策略已从AntPathMatcher更改为PathPatternParser,需要手动指定为ant-path-matcher
+    pathmatch:
+      matching-strategy: ant_path_matcher
+  resource:
+    static-locations: classpath:/static/,classpath:/public/
+  autoconfigure:
+    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
+  datasource:
+    druid:
+      stat-view-servlet:
+        enabled: true
+        loginUsername: admin
+        loginPassword: 123456
+        allow:
+      web-stat-filter:
+        enabled: true
+    dynamic:
+      druid: # 全局druid参数，绝大部分值和默认保持一致。(现已支持的参数如下,不清楚含义不要乱设置)
+        # 连接池的配置信息
+        # 初始化大小，最小，最大
+        initial-size: 5
+        min-idle: 5
+        maxActive: 20
+        # 配置获取连接等待超时的时间
+        maxWait: 60000
+        # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
+        timeBetweenEvictionRunsMillis: 60000
+        # 配置一个连接在池中最小生存的时间，单位是毫秒
+        minEvictableIdleTimeMillis: 300000
+        validationQuery: SELECT 1
+        testWhileIdle: true
+        testOnBorrow: false
+        testOnReturn: false
+        # 打开PSCache，并且指定每个连接上PSCache的大小
+        poolPreparedStatements: true
+        maxPoolPreparedStatementPerConnectionSize: 20
+        # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
+        filters: stat,wall,slf4j
+        # 通过connectProperties属性来打开mergeSql功能；慢SQL记录
+      #        connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
+      datasource:
+        master:
+          url: jdbc:mysql://47.120.64.83:3306/cheer-api?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai&autoReconnect=true&failOverReadOnly=false
+          username: root
+          password: n+~@kB_Z
+          driver-class-name: com.mysql.cj.jdbc.Driver
+          # 多数据源配置
+          #multi-datasource1:
+          #url: jdbc:mysql://localhost:3306/jeecg-boot2?useUnicode=true&characterEncoding=utf8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+          #username: root
+          #password: root
+          #driver-class-name: com.mysql.cj.jdbc.Driver
+  #redis 配置
+  redis:
+    database: 2
+    host: 47.120.64.83
+    lettuce:
+      pool:
+        max-active: -1   #最大连接数据库连接数,设 -1 为没有限制
+        max-idle: 0     #最大等待连接中的数量,设 0 为没有限制
+        max-wait: -1ms  #最大建立连接等待时间。如果超过此时间将接到异常。设为-1表示无限制。
+        min-idle: 0     #最小等待连接中的数量,设 0 为没有限制
+      shutdown-timeout: 1000ms
+    password: 'aq.888888'
+    port: 6379
+#mybatis plus 设置
+mybatis-plus:
+  mapper-locations: classpath*:org/jeecg/**/xml/*Mapper.xml
+  global-config:
+    # 关闭MP3.0自带的banner
+    banner: false
+    db-config:
+      #主键类型  0:"数据库ID自增",1:"该类型为未设置主键类型", 2:"用户输入ID",3:"全局唯一ID (数字类型唯一ID)", 4:"全局唯一ID UUID",5:"字符串全局唯一ID (idWorker 的字符串表示)";
+      id-type: ASSIGN_ID
+      # 默认数据库表下划线命名
+      table-underline: true
+  configuration:
+    # 这个配置会将执行的sql打印出来，在开发或测试的时候可以用
+    #    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+    # 返回类型为Map,显示null对应的字段
+    call-setters-on-nulls: true
+#jeecg专用配置
+minidao :
+  base-package: org.jeecg.modules.jmreport.*
+jeecg :
+  # 是否启用安全模式
+  safeMode: false
+  # 签名密钥串(前后端要一致，正式发布请自行修改)
+  signatureSecret: dd05f1c54d63749eda95f9fa6d49v442a
+  # 本地：local\Minio：minio\阿里云：alioss
+  uploadType: alioss
+  path :
+    #文件上传根目录 设置
+    upload: /opt/upFiles
+    #webapp文件路径
+    webapp: /opt/webapp
+  shiro:
+    excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/**
+  #阿里云oss存储和大鱼短信秘钥配置
+  oss:
+    accessKey: LTAI5tMan18fjJPUtr3Aim2W
+    secretKey: lhALqqgYijc115wY8c1KfTYkbSnq5I
+    endpoint: oss-cn-shenzhen.aliyuncs.com
+    bucketName: mangoimageapplet
+    staticDomain: https://dianpin-img.xzaiyp.top
+  # ElasticSearch 6设置
+  elasticsearch:
+    cluster-name: jeecg-ES
+    cluster-nodes: 127.0.0.1:9200
+    check-enabled: false
+  # 表单设计器配置
+  desform:
+    # 主题颜色（仅支持 16进制颜色代码）
+    theme-color: "#1890ff"
+    # 文件、图片上传方式，可选项：qiniu（七牛云）、system（跟随系统配置）
+    upload-type: system
+    map:
+      # 配置百度地图的AK，申请地址：https://lbs.baidu.com/apiconsole/key?application=key#/home
+      baidu: ??
+  # 在线预览文件服务器地址配置
+  file-view-domain: 127.0.0.1:8012
+  # minio文件上传
+  minio:
+    minio_url: http://minio.jeecg.com
+    minio_name: ??
+    minio_pass: ??
+    bucketName: otatest
+  #大屏报表参数设置
+  jmreport:
+    mode: dev
+    #数据字典是否进行saas数据隔离，自己看自己的字典
+    saas: false
+    #是否需要校验token
+    is_verify_token: true
+    #必须校验方法
+    verify_methods: remove,delete,save,add,update
+    #自定义项目前缀
+    customPrePath:
+    pageSize:
+      - 10
+      - 20
+      - 30
+      - 40
+  #Wps在线文档
+  wps:
+    domain: https://wwo.wps.cn/office/
+    appid: ??
+    appsecret: ??
+  #xxl-job配置
+  xxljob:
+    enabled: false
+    adminAddresses: http://127.0.0.1:9080/xxl-job-admin
+    appname: ${spring.application.name}
+    accessToken: ''
+    address: 127.0.0.1:30007
+    ip: 127.0.0.1
+    port: 30007
+    logPath: logs/jeecg/job/jobhandler/
+    logRetentionDays: 30
+  route:
+    config:
+      data-id: jeecg-gateway-router
+      group: DEFAULT_GROUP
+      #自定义路由配置 yml nacos database
+      data-type: database
+  #分布式锁配置
+  redisson:
+    address: 127.0.0.1:6379
+    password:
+    type: STANDALONE
+    enabled: true
+#cas单点登录
+cas:
+  prefixUrl: http://cas.example.org:8443/cas
+#Mybatis输出sql日志
+logging:
+  level:
+    org.jeecg.modules.system.mapper : info
+    org.jeecg.modules : debug
+#swagger
+knife4j:
+  #开启增强配置
+  enable: true
+  #开启生产环境屏蔽
+  production: false
+  basic:
+    enable: false
+    username: jeecg
+    password: jeecg1314
+#第三方登录
+justauth:
+  enabled: true
+  type:
+    GITHUB:
+      client-id: ??
+      client-secret: ??
+      redirect-uri: http://sso.test.com:8080/jeecg-boot/sys/thirdLogin/github/callback
+    WECHAT_ENTERPRISE:
+      client-id: ??
+      client-secret: ??
+      redirect-uri: http://sso.test.com:8080/jeecg-boot/sys/thirdLogin/wechat_enterprise/callback
+      agent-id: ??
+    DINGTALK:
+      client-id: ??
+      client-secret: ??
+      redirect-uri: http://sso.test.com:8080/jeecg-boot/sys/thirdLogin/dingtalk/callback
+    WECHAT_OPEN:
+      client-id: ??
+      client-secret: ??
+      redirect-uri: http://sso.test.com:8080/jeecg-boot/sys/thirdLogin/wechat_open/callback
+  cache:
+    type: default
+    prefix: 'demo::'
+    timeout: 1h
+#第三方APP对接
+third-app:
+  enabled: false
+  type:
+    #企业微信
+    WECHAT_ENTERPRISE:
+      enabled: false
+      #CORP_ID
+      client-id: ??
+      #SECRET
+      client-secret: ??
+      #自建应用id
+      agent-id: ??
+      #自建应用秘钥（新版企微需要配置）
+      # agent-app-secret: ??
+    #钉钉
+    DINGTALK:
+      enabled: false
+      # appKey
+      client-id: ??
+      # appSecret
+      client-secret: ??
+      agent-id: ??
+

jeecg-boot-module-system/src/main/resources/pay_weixin.properties

@@ -2,7 +2,7 @@ pay.mchId=1684003236
 pay.appId=wxe337e285c449abfc
 pay.mchKey=0fdb77429ffdf206c151af76a663041c
 pay.keyPath=classpath:apiclient_cert.pem
-pay.notifyUrl=https://cheer-admin.xzaiyp.top/cheer-admin/cheer/info/notify
-pay.notifyUrlDev=https://cheer-admin.xzaiyp.top/cheer-admin/cheer/info/notify
+pay.notifyUrl=http://h5.xzaiyp.top/cheer-admin/cheer/two/notify
+pay.notifyUrlDev=http://h5.xzaiyp.top/cheer-admin/cheer/two/notify
 
 

han-hai-parent.iml → yaodu-api.iml

@@ -4,6 +4,8 @@
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/${project.build.directory}/classes" />
+      <excludeFolder url="file://$MODULE_DIR$/${project.build.directory}/test-classes" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
     <orderEntry type="inheritedJdk" />