fixed 会员信息保存接口优化

configure/prod/application.properties

@@ -25,17 +25,33 @@ spring.redis.pool.min-idle=0
 # \u8FDE\u63A5\u8D85\u65F6\u65F6\u95F4\uFF08\u6BEB\u79D2\uFF09
 spring.redis.timeout=0
 
+# \u7CFB\u7EDF\u540D\u79F0
+system.name = fuint\u4F1A\u5458\u8425\u9500\u7BA1\u7406\u7CFB\u7EDF
+
+# \u524D\u7AEFh5\u5730\u5740
+website.url=https://www.fuint.cn/h5/
+
+# \u4E0A\u4F20\u56FE\u7247\u672C\u5730\u5730\u5740
+images.root=/www/wwwroot/www.xxx.com
+images.path=/static/uploadImages/
+
+# \u4E0A\u4F20\u56FE\u7247\u670D\u52A1\u5668\u57DF\u540D
+images.upload.url=http://localhost:8080
+
+# \u4E0A\u4F20\u56FE\u7247\u5141\u8BB8\u7684\u5927\u5C0F\uFF08\u5355\u4F4D\uFF1AMB\uFF09
+images.upload.maxSize=5
+
 ################## \u5B9A\u65F6\u811A\u672C\u914D\u7F6E #########################
 # \u5B9A\u65F6\u53D1\u9001\u6D88\u606F
-message.job.switch = 0
+message.job.switch = 1
 message.job.time = 0 0/1 * * * ?
 
 # \u5361\u5238\u5230\u671F\u5904\u7406
-couponExpire.job.switch = 0
+couponExpire.job.switch = 1
 couponExpire.job.time = 0 0/1 * * * ?
 
 # \u8BA2\u5355\u8D85\u65F6\u53D6\u6D88
-orderCancel.job.switch = 0
+orderCancel.job.switch = 1
 orderCancel.job.time = 0 0/1 * * * ?
 
 # \u5206\u4F63\u63D0\u6210\u8BA1\u7B97
@@ -45,3 +61,53 @@ commission.job.time = 0 0/1 * * * ?
 # \u5FAE\u4FE1\u5C0F\u7A0B\u5E8F\u4E0A\u4F20\u53D1\u8D27\u4FE1\u606F\u5904\u7406
 uploadShippingInfoJob.job.switch = 1
 uploadShippingInfoJob.job.time = 0 0/1 * * * ?
+
+################## \u963F\u91CC\u4E91\u77ED\u4FE1\u914D\u7F6E #######################
+# \u77ED\u4FE1\u63A5\u53E3\u6A21\u5F0F[0-\u5173\u95ED 1-\u6253\u5F00]
+aliyun.sms.mode = 0
+aliyun.sms.accessKeyId=LTAI4GJMjV123oXsrQJLnPZt
+aliyun.sms.accessKeySecret=eGVBL30u5Ypj234d7XODlwYKWTaGT
+# \u963F\u91CC\u4E91\u77ED\u4FE1\u7B7E\u540D
+aliyun.sms.signName=\u5EF6\u79BE\u6280\u672F
+
+################## \u963F\u91CC\u4E91OSS\u5B58\u50A8\u914D\u7F6E######################
+# \u6A21\u5F0F[0-\u5173\u95ED 1-\u6253\u5F00]
+aliyun.oss.mode = 0
+aliyun.oss.accessKeyId = LTAI4GJMjVhBa212rQJLnPZt
+aliyun.oss.accessKeySecret = eGVBL30u53456gXd7XODlwYKWTaGT
+aliyun.oss.endpoint = https://oss-cn-shenzhen.aliyuncs.com
+aliyun.oss.bucketName = fuint-application
+# \u4E0A\u4F20\u6587\u4EF6\u5939
+aliyun.oss.folder = uploads
+# \u8BBF\u95EE\u57DF\u540D
+aliyun.oss.domain = https://fuint-application.oss-cn-shenzhen.aliyuncs.com
+
+################## \u5FAE\u4FE1\u76F8\u5173\u914D\u7F6E ##########################
+# \u516C\u4F17\u53F7\u914D\u7F6E
+weixin.official.appId=wxf4327ef05c27a0
+weixin.official.appSecret=1f55e8749332234d9a074873d8e6a3
+
+# \u5C0F\u7A0B\u5E8F\u914D\u7F6E
+wxpay.appId = wxb6af3741234162bc
+wxpay.appSecret = 76a538bfa5b55a4564d5f2be5540
+wxpay.mchId=1636980812
+wxpay.apiV2=34354320201030y323e432342343
+wxpay.apiV3=fuyuan89982312312992399887678981
+wxpay.certPath=/usr/local/fuint/cert/apiclient_cert.p12
+wxpay.domain=https://www.fuint.cn/fuint-application
+
+################## \u652F\u4ED8\u5B9D\u652F\u4ED8\u76F8\u5173\u914D\u7F6E ######################
+alipay.appId = \u5E94\u7528\u7F16\u53F7
+alipay.privateKey = \u5E94\u7528\u79C1\u94A5
+alipay.publicKey = \u652F\u4ED8\u5B9D\u516C\u94A5\uFF08\u901A\u8FC7\u5E94\u7528\u516C\u94A5\u4E0A\u4F20\u5230\u652F\u4ED8\u5B9D\u5F00\u653E\u5E73\u53F0\u6362\u53D6\u652F\u4ED8\u5B9D\u516C\u94A5\uFF09
+alipay.serverUrl=https://openapi.alipay.com/gateway.do
+alipay.domain=https://www.fuint.cn/fuint-application/clientApi/pay/aliPayCallback
+
+################ \u5FAE\u4FE1\u8BA2\u9605\u6A21\u677F\u6D88\u606F\u914D\u7F6E ######################
+weixin.subMessage.orderCreated=[{'key':'time', 'name':'\u8BA2\u5355\u65F6\u95F4'},{'key':'orderSn', 'name':'\u8BA2\u5355\u53F7'},{'key':'remark', 'name':'\u5907\u6CE8\u4FE1\u606F'}]
+weixin.subMessage.deliverGoods=[{'key':'receiver', 'name':'\u6536\u8D27\u4EBA'}, {'key':'orderSn', 'name':'\u8BA2\u5355\u53F7'}, {'key':'expressCompany', 'name':'\u5FEB\u9012\u516C\u53F8'}, {'key':'expressNo', 'name':'\u5FEB\u9012\u5355\u53F7'}]
+weixin.subMessage.couponExpire=[{'key':'name', 'name':'\u5361\u5238\u540D\u79F0'}, {'key':'expireTime', 'name':'\u5230\u671F\u65F6\u95F4'},{'key':'tips', 'name':'\u6E29\u99A8\u63D0\u793A'}]
+weixin.subMessage.couponArrival=[{'key':'name', 'name':'\u5361\u5238\u540D\u79F0'},{'key':'amount', 'name':'\u91D1\u989D'},{'key':'tips', 'name':'\u6E29\u99A8\u63D0\u793A'}]
+weixin.subMessage.balanceChange=[{'key':'amount', 'name':'\u53D8\u52A8\u91D1\u989D'},{'key':'time', 'name':'\u53D8\u52A8\u65F6\u95F4'},{'key':'tips', 'name':'\u6E29\u99A8\u63D0\u793A'}]
+weixin.subMessage.couponConfirm=[{'key':'name', 'name':'\u5361\u5238\u540D\u79F0'},{'key':'time', 'name':'\u6838\u9500\u65F6\u95F4'}]
+weixin.subMessage.pointChange=[{'key':'amount', 'name':'\u53D8\u52A8\u6570\u91CF'},{'key':'time', 'name':'\u53D8\u52A8\u65F6\u95F4'},{'key':'remark', 'name':'\u5907\u6CE8\u4FE1\u606F'}]

fuint-application/src/main/java/com/fuint/module/clientApi/controller/ClientUserController.java

@@ -10,6 +10,7 @@ import com.fuint.common.util.*;
 import com.fuint.framework.exception.BusinessCheckException;
 import com.fuint.framework.web.BaseController;
 import com.fuint.framework.web.ResponseObject;
+import com.fuint.module.clientApi.request.MemberInfoRequest;
 import com.fuint.repository.model.*;
 import com.fuint.utils.StringUtil;
 import io.swagger.annotations.Api;
@@ -258,18 +259,19 @@ public class ClientUserController extends BaseController {
     @ApiOperation(value = "保存会员信息")
     @RequestMapping(value = "/saveInfo", method = RequestMethod.POST)
     @CrossOrigin
-    public ResponseObject saveInfo(HttpServletRequest request, @RequestBody Map<String, Object> param) throws BusinessCheckException {
+    public ResponseObject saveInfo(HttpServletRequest request, @RequestBody MemberInfoRequest memberInfo) throws BusinessCheckException {
         String token = request.getHeader("Access-Token");
         String merchantNo = request.getHeader("merchantNo") == null ? "" : request.getHeader("merchantNo");
-        String name = param.get("name") == null ? "" : param.get("name").toString();
-        String birthday = param.get("birthday") == null ? "" : param.get("birthday").toString();
-        String avatar = param.get("avatar") == null ? "" : param.get("avatar").toString();
-        Integer sex = param.get("sex") == null ? 1 : Integer.parseInt(param.get("sex").toString());
-        String code = param.get("code") == null ? "" : param.get("code").toString();
-        String password = param.get("password") == null ? "" : param.get("password").toString();
-        String passwordOld = param.get("passwordOld") == null ? "" : param.get("passwordOld").toString();
-        String phone = param.get("mobile") == null ? "" : param.get("mobile").toString();
-        String verifyCode = param.get("verifyCode") == null ? "" : param.get("verifyCode").toString();
+        String name = memberInfo.getName();
+        String birthday = memberInfo.getBirthday();
+        String avatar = memberInfo.getAvatar();
+        Integer sex = memberInfo.getSex();
+        String code = memberInfo.getCode();
+        String password = memberInfo.getPassword();
+        String passwordOld = memberInfo.getPasswordOld();
+        String phone = memberInfo.getMobile();
+        String verifyCode = memberInfo.getVerifyCode();
+
         String mobile = "";
         Integer merchantId = merchantService.getMerchantId(merchantNo);
         UserInfo userInfo = TokenUtil.getUserInfoByToken(token);
@@ -292,7 +294,7 @@ public class ClientUserController extends BaseController {
         if (StringUtil.isNotEmpty(code)) {
             JSONObject loginInfo = weixinService.getWxProfile(merchantId, code);
             if (loginInfo != null) {
-                mobile = weixinService.getPhoneNumber(param.get("encryptedData").toString(), loginInfo.get("session_key").toString(), param.get("iv").toString());
+                mobile = weixinService.getPhoneNumber(memberInfo.getEncryptedData(), loginInfo.get("session_key").toString(), memberInfo.getIv());
             }
         }