夏文涛 3 éve
szülő
commit
ceab832816
29 módosított fájl, 1389 hozzáadás és 2316 törlés
  1. 1 2
      .idea/encodings.xml
  2. 13 0
      .idea/libraries/Maven__com_github_wxpay_wxpay_sdk_0_0_3.xml
  3. 0 124
      .idea/uiDesigner.xml
  4. 68 1044
      .idea/workspace.xml
  5. 2 1
      ihotel.iml
  6. 17 0
      pom.xml
  7. 24 0
      src/main/java/com/chuanghai/ihotel/config/PayConfig.java
  8. 41 0
      src/main/java/com/chuanghai/ihotel/controller/HotelUserController.java
  9. 29 0
      src/main/java/com/chuanghai/ihotel/controller/TestController.java
  10. 7 0
      src/main/java/com/chuanghai/ihotel/service/impl/HotelUserServiceImpl.java
  11. 6 0
      src/main/resources/application-prod.yml
  12. 570 570
      src/main/resources/static/doc/index.html
  13. 4 0
      src/main/resources/static/doc/search.js
  14. 20 0
      target/classes/META-INF/spring-configuration-metadata.json
  15. 6 0
      target/classes/application-prod.yml
  16. BIN
      target/classes/com/chuanghai/ihotel/config/PayConfig.class
  17. BIN
      target/classes/com/chuanghai/ihotel/controller/HotelUserController.class
  18. BIN
      target/classes/com/chuanghai/ihotel/controller/TestController.class
  19. BIN
      target/classes/com/chuanghai/ihotel/service/impl/HotelUserServiceImpl$1.class
  20. BIN
      target/classes/com/chuanghai/ihotel/service/impl/HotelUserServiceImpl$2.class
  21. BIN
      target/classes/com/chuanghai/ihotel/service/impl/HotelUserServiceImpl.class
  22. 568 568
      target/classes/static/doc/index.html
  23. 4 0
      target/classes/static/doc/search.js
  24. BIN
      target/ihotel-0.0.1-SNAPSHOT.jar
  25. BIN
      target/ihotel-0.0.1-SNAPSHOT.jar.original
  26. 1 0
      target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
  27. 1 0
      target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
  28. 6 6
      target/surefire-reports/TEST-com.chuanghai.ihotel.IhotelApplicationTests.xml
  29. 1 1
      target/surefire-reports/com.chuanghai.ihotel.IhotelApplicationTests.txt

+ 1 - 2
.idea/encodings.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="Encoding" defaultCharsetForPropertiesFiles="UTF-8">
+  <component name="Encoding">
     <file url="file://$PROJECT_DIR$" charset="UTF-8" />
-    <file url="PROJECT" charset="UTF-8" />
   </component>
 </project>

+ 13 - 0
.idea/libraries/Maven__com_github_wxpay_wxpay_sdk_0_0_3.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.github.wxpay:wxpay-sdk:0.0.3">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/wxpay/wxpay-sdk/0.0.3/wxpay-sdk-0.0.3.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/wxpay/wxpay-sdk/0.0.3/wxpay-sdk-0.0.3-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/wxpay/wxpay-sdk/0.0.3/wxpay-sdk-0.0.3-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

+ 0 - 124
.idea/uiDesigner.xml

@@ -1,124 +0,0 @@
-<?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>

A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 68 - 1044
.idea/workspace.xml


+ 2 - 1
ihotel.iml

@@ -25,6 +25,8 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Maven: com.github.wxpay:wxpay-sdk:0.0.3" level="project" />
+    <orderEntry type="library" name="Maven: cn.hutool:hutool-all:5.6.6" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.7.2" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.7.2" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.7.2" level="project" />
@@ -172,6 +174,5 @@
     <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.57" level="project" />
     <orderEntry type="library" name="Maven: net.sf.trove4j:core:3.1.0" level="project" />
     <orderEntry type="library" name="Maven: javax.validation:validation-api:2.0.1.Final" level="project" />
-    <orderEntry type="library" name="Maven: cn.hutool:hutool-all:5.6.6" level="project" />
   </component>
 </module>

+ 17 - 0
pom.xml

@@ -17,6 +17,23 @@
         <java.version>1.8</java.version>
     </properties>
     <dependencies>
+
+        <!-- 微信支付 SDK -->
+        <dependency>
+            <groupId>com.github.wxpay</groupId>
+            <artifactId>wxpay-sdk</artifactId>
+            <version>0.0.3</version>
+        </dependency>
+
+        <!-- hutool -->
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-all</artifactId>
+            <version>5.7.2</version>
+        </dependency>
+
+
+
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>

+ 24 - 0
src/main/java/com/chuanghai/ihotel/config/PayConfig.java

@@ -0,0 +1,24 @@
+package com.chuanghai.ihotel.config;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.stereotype.Component;
+
+/**
+ * 微信支付配置
+ * @author shuqingyou 2022/9/16
+ */
+@Data
+@Configuration
+@ConfigurationProperties(prefix = "pay")
+public class PayConfig {
+    //微信公众号appid
+    private String appid;
+
+    //公众号设置的api密钥
+    private String apiKey;
+
+    //#微信商户平台 商户id
+    private String mchId;
+}

+ 41 - 0
src/main/java/com/chuanghai/ihotel/controller/HotelUserController.java

@@ -3,20 +3,27 @@ package com.chuanghai.ihotel.controller;
 import com.chuanghai.ihotel.anno.UserLoginCheck;
 import com.chuanghai.ihotel.aop.LoginCheckAspect;
 import com.chuanghai.ihotel.common.utils.CommonResult;
+import com.chuanghai.ihotel.config.PayConfig;
 import com.chuanghai.ihotel.dto.LoginUserDTO;
 import com.chuanghai.ihotel.entity.HotelUserEntity;
 import com.chuanghai.ihotel.service.HotelUserService;
 import com.chuanghai.ihotel.vo.LoginUserVO;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.converter.StringHttpMessageConverter;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.client.RestTemplate;
 
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
 
 /**
  * 普通用户
@@ -34,6 +41,9 @@ public class HotelUserController {
     @Autowired
     private HotelUserService hotelUserService;
 
+    @Autowired
+    PayConfig payConfig;
+
     /**
      * 微校授权回调地址
      *
@@ -49,6 +59,7 @@ public class HotelUserController {
      */
     @GetMapping("weixiaoAuth")
     public String weixiaoAuth(String wxcode, String state) throws UnsupportedEncodingException {
+        System.out.println("微校code = " + wxcode);
         LoginUserVO loginUserVO = hotelUserService.weixiaoAuth(wxcode, state);
 
         if (loginUserVO != null) {
@@ -58,6 +69,36 @@ public class HotelUserController {
         }
     }
 
+    @GetMapping("weixinAuth")
+    public String weiximAuth(String code,String state) throws UnsupportedEncodingException {
+        System.out.println("微信code = " + code);
+        System.out.println("appid = " + payConfig.getAppid());
+        System.out.println("appkey = " + payConfig.getApiKey());
+//            通过wxcode获取openid
+        String url = "https://api.weixin.qq.com/sns/oauth2/access_token?" +
+                "appid=" + payConfig.getAppid() +
+                "&secret=" + payConfig.getApiKey() +
+                "&code=" + code +
+                "&grant_type=authorization_code";
+
+        try {
+            RestTemplate restTemplate = new RestTemplate();
+            restTemplate.getMessageConverters().set(1, new StringHttpMessageConverter(StandardCharsets.UTF_8)); // 解决回参中文乱码
+            String response = restTemplate.getForObject(url, String.class);
+            ObjectMapper mapper2 = new ObjectMapper();
+            JsonNode jsonNode = mapper2.readTree(response);
+            System.out.println("jsonNode = " + jsonNode);
+            String openid = jsonNode.get("openid").asText();
+
+            return "redirect:"+ fontEndUrl+ "/#/" + state + "/?openId=" + openid;
+
+        }catch (Exception e){
+            e.printStackTrace();
+            return "redirect:" + fontEndUrl + "/error/?errorMsg=获取用户openId失败";
+        }
+
+    }
+
     /**
      * 获取用户信息
      * @param userToken 用户token

+ 29 - 0
src/main/java/com/chuanghai/ihotel/controller/TestController.java

@@ -1,5 +1,6 @@
 package com.chuanghai.ihotel.controller;
 
+import com.alibaba.fastjson.JSONObject;
 import com.chuanghai.ihotel.component.DoorLockComponent;
 import com.chuanghai.ihotel.component.WaterElectricComponent;
 import com.chuanghai.ihotel.component.WeiXiaoComponent;
@@ -86,4 +87,32 @@ public class TestController {
     public void test8() {
         weiXiaoComponent.sendNotice(Arrays.asList("360100188808088881"), "公寓预定成功通知", "公寓预定成功", "你好,你的公寓预定成功,你好,你的公寓预定成功,你好,你的公寓预定成功,你好,你的公寓预定成功。", Arrays.asList("点击跳转", "www.baidu.com"));
     }
+
+
+
+    @GetMapping
+    public void test9(String openid){
+        JSONObject jsonObject = new JSONObject();
+//        由微信生成的应用ID,全局唯一
+        jsonObject.put("appid","wxa46ef222053a1047");
+//        直连商户的商户号,由微信支付生成并下发
+        jsonObject.put("mchid","1612322883");
+//        商品描述
+        jsonObject.put("description","押金");
+//        商户系统内部订单号,只能是数字、大小写字母_-*且在同一个商户号下唯一
+        jsonObject.put("out_trade_no","202306141642346631668901733683724290");
+//        异步接收微信支付结果通知的回调地址,通知url必须为外网可访问的url,不能携带参数
+        jsonObject.put("notify_url","");
+
+        JSONObject amount = new JSONObject();
+        amount.put("total",1);
+        amount.put("currency","CNY");
+
+        JSONObject payer = new JSONObject();
+        payer.put("openid","");
+
+    }
+
+
+
 }

+ 7 - 0
src/main/java/com/chuanghai/ihotel/service/impl/HotelUserServiceImpl.java

@@ -2,6 +2,7 @@ package com.chuanghai.ihotel.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.chuanghai.ihotel.config.PayConfig;
 import com.chuanghai.ihotel.config.WeixiaoConfig;
 import com.chuanghai.ihotel.dao.HotelUserDao;
 import com.chuanghai.ihotel.dto.LoginUserDTO;
@@ -10,15 +11,18 @@ import com.chuanghai.ihotel.service.HotelUserService;
 import com.chuanghai.ihotel.util.JWTUtil;
 import com.chuanghai.ihotel.vo.LoginUserVO;
 import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
+import org.springframework.http.converter.StringHttpMessageConverter;
 import org.springframework.stereotype.Service;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
 import org.springframework.web.client.RestTemplate;
 
+import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -29,6 +33,8 @@ public class HotelUserServiceImpl extends ServiceImpl<HotelUserDao, HotelUserEnt
     @Autowired
     private WeixiaoConfig weixiaoConfig;
 
+
+
     @Override
     public HotelUserEntity findByCardNumber(String cardNumber) {
         QueryWrapper<HotelUserEntity> queryWrapper = new QueryWrapper<>();
@@ -79,6 +85,7 @@ public class HotelUserServiceImpl extends ServiceImpl<HotelUserDao, HotelUserEnt
             String telephone = userInfoMap.get("telephone").toString();
             String headImage = userInfoMap.get("head_image").toString();
 
+
             // 用户信息生成token返回
             return generateToken(cardNumber, name, identityType, telephone, headImage);
         } catch (Exception e) {

+ 6 - 0
src/main/resources/application-prod.yml

@@ -104,3 +104,9 @@ weixiao:
   app-key: 4FD5599032819781
   app-secret: 0174DFB98063A612526C6B69F941E14A
   ocode: 1015730314
+
+pay:
+  appid: wxa46ef222053a1047 #微信公众号id
+  apiKey: 16f74a1265c314fd79fdf90670173467 #微信公众号密钥
+  mchId: 1612322883  #微信商户号id
+

A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 570 - 570
src/main/resources/static/doc/index.html


+ 4 - 0
src/main/resources/static/doc/search.js

@@ -200,6 +200,10 @@ api[4].list.push({
 });
 api[4].list.push({
     order: '2',
+    desc: '',
+});
+api[4].list.push({
+    order: '3',
     desc: '获取用户信息',
 });
 api.push({

+ 20 - 0
target/classes/META-INF/spring-configuration-metadata.json

@@ -11,6 +11,11 @@
       "sourceType": "com.chuanghai.ihotel.config.JXNXSPayConfig"
     },
     {
+      "name": "pay",
+      "type": "com.chuanghai.ihotel.config.PayConfig",
+      "sourceType": "com.chuanghai.ihotel.config.PayConfig"
+    },
+    {
       "name": "water-electric",
       "type": "com.chuanghai.ihotel.config.WaterElectricConfig",
       "sourceType": "com.chuanghai.ihotel.config.WaterElectricConfig"
@@ -63,6 +68,21 @@
       "sourceType": "com.chuanghai.ihotel.config.JXNXSPayConfig"
     },
     {
+      "name": "pay.api-key",
+      "type": "java.lang.String",
+      "sourceType": "com.chuanghai.ihotel.config.PayConfig"
+    },
+    {
+      "name": "pay.appid",
+      "type": "java.lang.String",
+      "sourceType": "com.chuanghai.ihotel.config.PayConfig"
+    },
+    {
+      "name": "pay.mch-id",
+      "type": "java.lang.String",
+      "sourceType": "com.chuanghai.ihotel.config.PayConfig"
+    },
+    {
       "name": "water-electric.data-secret",
       "type": "java.lang.String",
       "description": "运营商数据秘钥",

+ 6 - 0
target/classes/application-prod.yml

@@ -104,3 +104,9 @@ weixiao:
   app-key: 4FD5599032819781
   app-secret: 0174DFB98063A612526C6B69F941E14A
   ocode: 1015730314
+
+pay:
+  appid: wxa46ef222053a1047 #微信公众号id
+  apiKey: 16f74a1265c314fd79fdf90670173467 #微信公众号密钥
+  mchId: 1612322883  #微信商户号id
+

BIN
target/classes/com/chuanghai/ihotel/config/PayConfig.class


BIN
target/classes/com/chuanghai/ihotel/controller/HotelUserController.class


BIN
target/classes/com/chuanghai/ihotel/controller/TestController.class


BIN
target/classes/com/chuanghai/ihotel/service/impl/HotelUserServiceImpl$1.class


BIN
target/classes/com/chuanghai/ihotel/service/impl/HotelUserServiceImpl$2.class


BIN
target/classes/com/chuanghai/ihotel/service/impl/HotelUserServiceImpl.class


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 568 - 568
target/classes/static/doc/index.html


+ 4 - 0
target/classes/static/doc/search.js

@@ -200,6 +200,10 @@ api[4].list.push({
 });
 api[4].list.push({
     order: '2',
+    desc: '',
+});
+api[4].list.push({
+    order: '3',
     desc: '获取用户信息',
 });
 api.push({

BIN
target/ihotel-0.0.1-SNAPSHOT.jar


BIN
target/ihotel-0.0.1-SNAPSHOT.jar.original


+ 1 - 0
target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -158,6 +158,7 @@ com\chuanghai\ihotel\controller\HotelStaffController.class
 com\chuanghai\ihotel\service\RoomTypeService.class
 com\chuanghai\ihotel\controller\request\AdminLoginRequest.class
 com\chuanghai\ihotel\common\utils\Constant.class
+com\chuanghai\ihotel\config\PayConfig.class
 com\chuanghai\ihotel\dao\RoomTypeDao.class
 com\chuanghai\ihotel\common\exception\BizCodeEnume.class
 com\chuanghai\ihotel\controller\request\SubmitOrderRequest.class

+ 1 - 0
target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -118,6 +118,7 @@ D:\Bingo\Desktop\工作内容\智慧酒店\ihotel-backend\src\main\java\com\chua
 D:\Bingo\Desktop\工作内容\智慧酒店\ihotel-backend\src\main\java\com\chuanghai\ihotel\service\RoomDoorLockDataService.java
 D:\Bingo\Desktop\工作内容\智慧酒店\ihotel-backend\src\main\java\com\chuanghai\ihotel\controller\request\SubmitOrderRequest.java
 D:\Bingo\Desktop\工作内容\智慧酒店\ihotel-backend\src\main\java\com\chuanghai\ihotel\dao\HotelStaffDao.java
+D:\Bingo\Desktop\工作内容\智慧酒店\ihotel-backend\src\main\java\com\chuanghai\ihotel\config\PayConfig.java
 D:\Bingo\Desktop\工作内容\智慧酒店\ihotel-backend\src\main\java\com\chuanghai\ihotel\service\impl\HotelStaffServiceImpl.java
 D:\Bingo\Desktop\工作内容\智慧酒店\ihotel-backend\src\main\java\com\chuanghai\ihotel\aop\ParamCheckAspect.java
 D:\Bingo\Desktop\工作内容\智慧酒店\ihotel-backend\src\main\java\com\chuanghai\ihotel\config\WeixiaoConfig.java

A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 6 - 6
target/surefire-reports/TEST-com.chuanghai.ihotel.IhotelApplicationTests.xml


+ 1 - 1
target/surefire-reports/com.chuanghai.ihotel.IhotelApplicationTests.txt

@@ -1,4 +1,4 @@
 -------------------------------------------------------------------------------
 Test set: com.chuanghai.ihotel.IhotelApplicationTests
 -------------------------------------------------------------------------------
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 9.121 s - in com.chuanghai.ihotel.IhotelApplicationTests
+Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 7.911 s - in com.chuanghai.ihotel.IhotelApplicationTests