微信配置

web/src/main/java/com/jpsoft/enterprise/config/WebMvcConfig.java

@@ -70,7 +70,8 @@ public class WebMvcConfig implements WebMvcConfigurer {
 				.excludePathPatterns("/mobile/companyInfoApi/attributeList")
 				.excludePathPatterns("/mobile/companyInfoApi/industryList")
 				.excludePathPatterns("/mobile/enterpriseInfoApi/enterpriseInfo")
-				.excludePathPatterns("/mobile/wechat/getConfig")
+				.excludePathPatterns("/mobile/wechat/**")
+
         ;
 	}
 }

web/src/main/java/com/jpsoft/enterprise/modules/mobile/controller/PersonInfoApiController.java

@@ -117,13 +117,13 @@ public class PersonInfoApiController {
         MessageResult<String> messageResult = new MessageResult<>();
 
         try {
-            PersonInfo personInfo = personInfoService.findByPhone(phone);
+           /* PersonInfo personInfo = personInfoService.findByPhone(phone);
 
             if (personInfo == null) {
                 throw new Exception("用户不存在!");
-            }
+            }*/
 
-            String key = "SMS_" + personInfo.getId();
+            String key = "SMS_" + phone;
 
             String verifyCode = (String) valueOperations.get(key);
 
@@ -133,13 +133,13 @@ public class PersonInfoApiController {
                 verifyCodeJSON.put("code", verifyCode);
 
                 //     messageResult = SMSUtil.send(merchantInfo.getContactPhone(), "SMS_49390047", verifyCodeJSON.toString());
-                messageResult = SMSUtil.send(personInfo.getPhone(), "校信达", "SMS_49390047", verifyCodeJSON);
+                messageResult = SMSUtil.send(phone, "校信达", "SMS_49390047", verifyCodeJSON);
 
                 //设置当前用户的验证码,5分钟内有效
                 valueOperations.set(key, verifyCode, 5, TimeUnit.MINUTES);
             }
 
-            messageResult.setData(personInfo.getId());
+        //    messageResult.setData(personInfo.getId());
             messageResult.setResult(true);
             messageResult.setCode(200);
         } catch (Exception ex) {
@@ -282,7 +282,13 @@ public class PersonInfoApiController {
             if (personInfo.getPhone().equals(phone)){
                 throw new Exception("请修改手机号");
             }
-            String smsKey = "SMS_" + personInfo.getId();
+
+            PersonInfo personInfo1 = personInfoService.findByPhone(phone);
+            if (personInfo1 != null){
+                throw new Exception("手机号已被人注册");
+            }
+
+            String smsKey = "SMS_" + phone;
 
             String beforeVerifyCode = (String) valueOperations.get(smsKey);
 
@@ -611,7 +617,7 @@ public class PersonInfoApiController {
 
     @PostMapping("getWeather")
     @ApiOperation(value = "获取当前城市的天气（公共接口）")
-    public MessageResult<WeatherDTO> getCity(String cityName) {
+    public MessageResult<WeatherDTO> getWeather(String cityName) {
 
         MessageResult<WeatherDTO> messageResult = new MessageResult<>();
 

web/src/main/java/com/jpsoft/enterprise/modules/wechat/controller/WxController.java

@@ -5,10 +5,13 @@ import com.jpsoft.enterprise.modules.common.dto.MessageResult;
 import com.jpsoft.enterprise.modules.common.utils.Sign;
 import com.jpsoft.enterprise.modules.common.utils.WeixinUtil;
 import com.jpsoft.enterprise.modules.wechat.entity.AccessToken;
+import com.jpsoft.enterprise.modules.wechat.vo.UserInfo;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -59,4 +62,36 @@ public class WxController {
 
         return new MessageResult(result, message, data, code);
     }
+
+    @ApiOperation(value = "获取公众号用户信息")
+    @GetMapping(value = "findUserInfo/{code}")
+    public MessageResult findUserInfo(@PathVariable String code) {
+        try {
+            log.warn("code=" + code);
+            log.warn("appId=" + wxConfig.getAppId());
+            log.warn("appSecret=" + wxConfig.getAppSecret());
+
+            AccessToken at = WeixinUtil.getAccessToken(wxConfig.getAppId(), wxConfig.getAppSecret(), code);
+
+            if (at != null && StringUtils.isNotBlank(at.getOpenid())) {
+                String openId = at.getOpenid();
+                System.out.println("openId:" + openId);
+
+                UserInfo userInfo = WeixinUtil.getUserInfo(openId, at.getToken());
+
+                HashMap<String, Object> dataMap = new HashMap<String, Object>();
+
+                dataMap.put("userInfo", userInfo);
+
+                return new MessageResult(true, "获取微信信息成功", userInfo, 200);
+
+            } else {
+                return new MessageResult(false, "获取微信信息失败", "", 400);
+            }
+
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            return new MessageResult(false, "系统错误", "", 500);
+        }
+    }
 }

web/src/main/resources/application-production.yml

@@ -38,9 +38,9 @@ wx:
   #荆楚云服务器内不能访问自身域名
   commonAccessTokenUrl: http://192.168.0.1:8080/weixin/token
   pay:
-    #小鹏管家
-    appId: wx7e70eb62a8459869
-    appSecret: 909d17e353268da57c4f18cc09798049
+    #企业联合会
+    appId: wx343bf93d2a3dc8af
+    appSecret: ac61fa669a7a79c7d2a8188ff7ddaef6
 #    appId: wx0b3c41a903053808
 #    appSecret: 43557bd62f77b0c3d6670e991872f0e7
     mchId: 1500160622
@@ -56,8 +56,8 @@ wx:
     portalUrl: "http://xpgj.xiaoxinda.com/prod/business/#/"
 
   jpsoft:
-    appId: wx907e84ad32e6e142
-    appSecret: 1d891ee3f4cc8002ff0330d1e04acf2c
+    appId: wx343bf93d2a3dc8af
+    appSecret: ac61fa669a7a79c7d2a8188ff7ddaef6
     mchId: 1509055881
     subMchId: 1523544111
     mchKey: xxd33333333333333333333333333333
@@ -67,30 +67,7 @@ wx:
     certPath: /usr/local/tomcat/webapps/cert/xiaoxinda/apiclient_cert.p12
     temporaryUrl: http://ykt.xiaoxinda.com/wxPay/wxJsapiPayTemporaryNotify
     urlKey: a3
-  cp:
-    corpId: wwe5fb36b045f42c42
-    appConfigs:
-      - agentId: 1000001
-        secret: jWDwhE92FPB7it7ciO0PzJbu2c0mErMYUNtsiYR3sEo
-        token: M9Kq
-        aesKey: K9j9sJJ6QhNZeCprXoFCU5NYm7jOlyyIXfY0Dewbfnm
-      - agentId: 1000002
-        secret: 1111
-        token: 111
-        aesKey: 111
 
-#可支付环境（小鹏物业app）
-parkalipay:
-  serviceUrl: https://openapi.alipay.com/gateway.do
-  appId: 2019031663559245
-  privateKey: MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDP1o0XIBiHlNhBamD+8KMFUuyc4R8pAZAmfDlyCKsC+fZNGLEtENroGGMkLw0RiB+exuXbwFkJEpcf2FtU/RECG27zL9r2JHjL6Z4jtNW5JGNK+ScIYUIacOLCAmGyOKPKUnxtqCtrn/m3WPO8ouucnqQIUc1pR9QA5EM8/Y1ckRzQcjSkzIK7caqxdN2L84YiXFSD7q7t1tCb6t2OoiPl4jgnzSrX6EwtBTdKnatahhrFseODyGdZUTNRVFWKss26m3U+oBLQUrIDfx6XYvDgPSR7dz1g4syenj0iI8TBsmgKyo0oufoGpeAOmAjTK4//KcqYqgWwaWDUE/Vfq20/AgMBAAECggEALs4rkgSpYYc0uG6jj2ZT4DQPkzjjkpGGjBQ3v6WSFaaDQFOKOxLrqY8sbI6oC8WzEUfLphSIOJHWNNa9osMnHGlfMCcb0YjfJ1TiRzpHU12NeunnT2zPvTKk7noo1EELKdovqWZQ+Pja/N5sbZPnKatUV4dMkiQZ62V8evTC7BBdxyeA1Ivg2uj1id0G7uLVhoPTuqn0+FHid8r3sSaPHKcY9hfGVat7WgQQoqGurBuJrLP4RTzyaHN3OxuZzMnSu6q7zhMpfBZK0xsrA2+D3pHPdsnOt6fKnDCBdaXsumonQEuJFmLqOjyYCqZLDrfp41E+Tj6enDuGamN/9f1HkQKBgQD6Mbm9IMab3nG8rKnJBQTMJmZryCgDm/RZtqlAnIxgk10lkF77KRy2ZVU0/zcwa8BK7Ah6sQHE0rQ/OxjUrRj7PBv0CKkm6FpVoLZVtWdNBkJQsAbU7sB0cIM9r7QHvRzxHYzS8V3pkCEHvvOmyNQ3b6S0cHasI2ILMHgYChFXJwKBgQDUqTWqdUjZD1+z94gYke76w1bZGMmJnPDCvChZjpIFP5M3PSt3+HJgqPHA/ptg1OPJ2DX+dUNsZsTsM71jDz/yax1+zZkgIO+nsUWrTGek7Oi8THdoICa1++xhL3WcpUXxIl+l9U75qyXW9DV/zggr1x6DQDU1UaunMsvRg4LIKQKBgQDXZJnYNfBmXkIiwa9GDVkM/H4uilnQiaH63mOl6WB9AEEvxrPOnJ1IdcK+Zn235PveRIgkQGEadp+Q1CrTZdZc7GnQVOhzQ5QJpdtzvEGbsSjEWFb5WDY9yGNkZvChvPC+r8b+D6ffHSMijQUscDcrJqVwZmX0Wl3c7jRl1b0J/wKBgQC1hd4WK1jMVxAk6SSVfHPWPskyNLNLMNheEQgMMeM4caTy4Nbq5/qRwYPibjIo/G+XymOEWYn8zNhImn2NQeYewgoCQ/Lx9ss6g9npNyW9JLAgktDV46PHcUu7RSyKUpUaGHI2kecgvFNnYTsNZcuZyFz2QedpJNZ1uKk7pJsMyQKBgDNatWHVOJez9MAwAzpIDM90vdm79nzTUQ5NzanroGLGPTzREYLyw7F4mB035D34DVeUPgRDy0RHSK0kdA/HHtvcr6ONVummXXBEKaGKC3KvFHf1EXMVI0iA9nB70BCjkokFegqeTexlC3bkEZiMT2iWdK8rdBakd1ITIAsLE9AO
-  zfbPublicKey: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAo3gaIrAD47mfSBmye1c8GLIRF4H3sl0MhT1OHIO0FqwtDqyxpHkrpOQADQggEzgv1nO82V+ChQxHUeaQ7W987+s1cnwtm7ZVML8DxVtji1va1ahBKL62dBommOoIt4fRIO2upbnF6r3NjB/3MCTZUIE03xIqc+aUeNdRO7eAMpm6sHjBfSimFwXlyTaEsAsnTK4hkOzdvoldHry6A3375kE3msj8Z48Nko7AFedOToPfJNolap+i7qWv3VOhnWLrAZH/Jgq/uHQmx8r29BeBl9AT4EwxDN5mVVKDOYsWW1efmrhKXO3wvzInhB6qQ8L1uBCWKhw1eGHCvlCjTHxBYQIDAQAB
-  inputCharset: UTF-8
-  mchId: 2088511854331096
-  # appAuthToken: 201906BBbc7d6558596f4bbc9f056c01b8aebX48
-  signType: RSA2
-  format : json
-  notifyUrl: http://zldb.xiaoxinda.com:8088/smart-community-server/aliPay/payNotify
 
 alipay:
   serviceUrl: https://openapi.alipay.com/gateway.do

web/src/main/resources/application-test.yml

@@ -42,9 +42,9 @@ springfox:
 
 wx:
   pay:
-    #小鹏管家
-    appId: wx7e70eb62a8459869
-    appSecret: 909d17e353268da57c4f18cc09798049
+    #企业联合会
+    appId: wx343bf93d2a3dc8af
+    appSecret: ac61fa669a7a79c7d2a8188ff7ddaef6
     token: weixin
     tokenUrl: "https://api.weixin.qq.com/cgi-bin/token"
     refreshOAuth2TokenUrl: "https://api.weixin.qq.com/sns/oauth2/refresh_token"
@@ -53,8 +53,8 @@ wx:
     portalUrl: http://xpgj.xiaoxinda.com/test/business/#/
 
   jpsoft:
-    appId: wx907e84ad32e6e142
-    appSecret: 1d891ee3f4cc8002ff0330d1e04acf2c
+    appId: wx343bf93d2a3dc8af
+    appSecret: ac61fa669a7a79c7d2a8188ff7ddaef6
     mchId: 1509055881
     subMchId: 1523544111
     mchKey: xxd33333333333333333333333333333
@@ -64,17 +64,6 @@ wx:
     certPath: /usr/local/tomcat/webapps/cert/xiaoxinda/apiclient_cert.p12
     temporaryUrl: http://ykt.xiaoxinda.com/wxPay/wxJsapiPayTemporaryNotify
     urlKey: a2
-  cp:
-    corpId: wwe5fb36b045f42c42
-    appConfigs:
-      - agentId: 1000001
-        secret: jWDwhE92FPB7it7ciO0PzJbu2c0mErMYUNtsiYR3sEo
-        token: M9Kq
-        aesKey: K9j9sJJ6QhNZeCprXoFCU5NYm7jOlyyIXfY0Dewbfnm
-      - agentId: 1000002
-        secret: 1111
-        token: 111
-        aesKey: 111
 
 
 alipay: