diff --git a/README.md b/README.md index eeaee91..37ae03e 100644 --- a/README.md +++ b/README.md @@ -35,8 +35,6 @@ 系统搭建部署：http://www.roncoo.com/article/detail/124511 -系统视频介绍：http://www.roncoo.com/details/a09d8badbce04bd380f56034f8e68be0 - 官方QQ群：287684257，欢迎大家加入，共同探讨互联网金融支付行业业务、技术等。 ![Alt text](http://git.oschina.net/uploads/images/2016/0722/175850_9e020e87_860625.png) diff --git a/UPDATELOG.md b/UPDATELOG.md index 2185f44..aa2adad 100644 --- a/UPDATELOG.md +++ b/UPDATELOG.md @@ -1,3 +1,10 @@ +###### v1.0.0-2016.9.11 +1. 修复条码支付bug +2. boss后台增加用户手机、密码 +3. 增加商户后台系统 + +---------------------------------------------------------------------------------- + ###### v0.0.4-2016.8.15 1. 修复权限模块bug 2. 修改对账模块配置文件路径 diff --git a/database.sql b/database.sql index dd80920..8f2d54c 100644 --- a/database.sql +++ b/database.sql @@ -1038,3 +1038,6 @@ alter table rp_user_pay_info add offline_app_id varchar(50); alter table rp_user_pay_info add rsa_private_key varchar(100); alter table rp_user_pay_info add rsa_public_key varchar(100); +-- 2016.9.5 增加登录信息字段 +alter table rp_user_info add mobile varchar(15); +alter table rp_user_info add password varchar(50); diff --git a/pom.xml b/pom.xml index a248b2e..c58d453 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.roncoo.pay.common roncoo-pay - 0.0.4-SNAPSHOT + 1.0.0-SNAPSHOT pom roncoo-pay @@ -30,6 +30,8 @@ roncoo-pay-web-gateway roncoo-pay-service + + roncoo-pay-web-merchant diff --git a/roncoo-pay-app-notify/pom.xml b/roncoo-pay-app-notify/pom.xml index 7bb6bb5..b36ecc9 100644 --- a/roncoo-pay-app-notify/pom.xml +++ b/roncoo-pay-app-notify/pom.xml @@ -5,11 +5,11 @@ com.roncoo.pay.common roncoo-pay - 0.0.4-SNAPSHOT + 1.0.0-SNAPSHOT com.roncoo.pay.common roncoo-pay-app-notify - 0.0.4-SNAPSHOT + 1.0.0-SNAPSHOT roncoo-app-notify http://maven.apache.org diff --git a/roncoo-pay-app-reconciliation/pom.xml b/roncoo-pay-app-reconciliation/pom.xml index 8183ad4..3648d3d 100644 --- a/roncoo-pay-app-reconciliation/pom.xml +++ b/roncoo-pay-app-reconciliation/pom.xml @@ -4,7 +4,7 @@ com.roncoo.pay.common roncoo-pay - 0.0.4-SNAPSHOT + 1.0.0-SNAPSHOT com.roncoo.pay.app roncoo-pay-app-reconciliation diff --git a/roncoo-pay-app-reconciliation/src/main/resources/log4j.properties b/roncoo-pay-app-reconciliation/src/main/resources/log4j.properties index 79105f8..aff05b7 100644 --- a/roncoo-pay-app-reconciliation/src/main/resources/log4j.properties +++ b/roncoo-pay-app-reconciliation/src/main/resources/log4j.properties @@ -9,7 +9,7 @@ log4j.appender.A1.layout.ConversionPattern=%d %5p [%F:%L] : %m%n log4j.appender.DRF=org.apache.log4j.DailyRollingFileAppender log4j.appender.DRF.Threshold=${log4j.leve} log4j.appender.DRF.DatePattern='.'yyyy-MM-dd -log4j.appender.DRF.File=logs/roncoo-app-reconcliation.log +log4j.appender.DRF.File=logs/roncoo-pay-app-reconcliation.log log4j.appender.DRF.Append=true log4j.appender.DRF.layout=org.apache.log4j.PatternLayout log4j.appender.DRF.layout.ConversionPattern=[%-5p][%d{yyyyMMdd HH:mm:ss,SSS}][%C{1}:%L] %m%n diff --git a/roncoo-pay-app-settlement/pom.xml b/roncoo-pay-app-settlement/pom.xml index df6999b..c915f1c 100644 --- a/roncoo-pay-app-settlement/pom.xml +++ b/roncoo-pay-app-settlement/pom.xml @@ -5,7 +5,7 @@ com.roncoo.pay.common roncoo-pay - 0.0.4-SNAPSHOT + 1.0.0-SNAPSHOT com.roncoo.pay.app roncoo-pay-app-settlement diff --git a/roncoo-pay-app-settlement/src/main/resources/log4j.properties b/roncoo-pay-app-settlement/src/main/resources/log4j.properties index 0b8bd50..a3e308c 100644 --- a/roncoo-pay-app-settlement/src/main/resources/log4j.properties +++ b/roncoo-pay-app-settlement/src/main/resources/log4j.properties @@ -9,7 +9,7 @@ log4j.appender.A1.layout.ConversionPattern=%d %5p [%F:%L] : %m%n log4j.appender.DRF=org.apache.log4j.DailyRollingFileAppender log4j.appender.DRF.Threshold=${log4j.leve} log4j.appender.DRF.DatePattern='.'yyyy-MM-dd -log4j.appender.DRF.File=logs/roncoo-app-settlement.log +log4j.appender.DRF.File=logs/roncoo-pay-app-settlement.log log4j.appender.DRF.Append=true log4j.appender.DRF.layout=org.apache.log4j.PatternLayout log4j.appender.DRF.layout.ConversionPattern=[%-5p][%d{yyyyMMdd HH:mm:ss,SSS}][%C{1}:%L] %m%n diff --git a/roncoo-pay-common-core/pom.xml b/roncoo-pay-common-core/pom.xml index 7f2cd95..bdcb484 100644 --- a/roncoo-pay-common-core/pom.xml +++ b/roncoo-pay-common-core/pom.xml @@ -4,7 +4,7 @@ com.roncoo.pay.common roncoo-pay - 0.0.4-SNAPSHOT + 1.0.0-SNAPSHOT roncoo-pay-common-core roncoo-pay-common-core diff --git a/roncoo-pay-common-core/src/main/java/com/roncoo/pay/common/core/page/PageParam.java b/roncoo-pay-common-core/src/main/java/com/roncoo/pay/common/core/page/PageParam.java index fb2dcfa..d79dc69 100644 --- a/roncoo-pay-common-core/src/main/java/com/roncoo/pay/common/core/page/PageParam.java +++ b/roncoo-pay-common-core/src/main/java/com/roncoo/pay/common/core/page/PageParam.java @@ -58,7 +58,10 @@ public class PageParam implements Serializable { * @param pageNum * @param numPerPage */ - public PageParam(int pageNum , int numPerPage){} + public PageParam(int pageNum , int numPerPage){ + this.pageNum = pageNum; + this.numPerPage = numPerPage; + } /** 当前页数 */ public int getPageNum() { diff --git a/roncoo-pay-service/pom.xml b/roncoo-pay-service/pom.xml index 53f1f0e..49906bc 100644 --- a/roncoo-pay-service/pom.xml +++ b/roncoo-pay-service/pom.xml @@ -4,7 +4,7 @@ com.roncoo.pay.common roncoo-pay - 0.0.4-SNAPSHOT + 1.0.0-SNAPSHOT com.roncoo.pay.service diff --git a/roncoo-pay-service/src/main/java/com/roncoo/pay/account/entity/RpAccountHistory.java b/roncoo-pay-service/src/main/java/com/roncoo/pay/account/entity/RpAccountHistory.java index 173eebc..e769348 100644 --- a/roncoo-pay-service/src/main/java/com/roncoo/pay/account/entity/RpAccountHistory.java +++ b/roncoo-pay-service/src/main/java/com/roncoo/pay/account/entity/RpAccountHistory.java @@ -20,6 +20,7 @@ import java.math.BigDecimal; import com.roncoo.pay.account.enums.AccountFundDirectionEnum; import com.roncoo.pay.common.core.entity.BaseEntity; +import com.roncoo.pay.common.core.utils.DateUtils; import com.roncoo.pay.trade.enums.TrxTypeEnum; /** @@ -170,4 +171,17 @@ public class RpAccountHistory extends BaseEntity implements Serializable { public void setUserNo(String userNo) { this.userNo = userNo == null ? null : userNo.trim(); } + + public String getAmountDesc() { + if(this.getFundDirection().equals(AccountFundDirectionEnum.ADD.name())){ + System.out.println("+"); + return "+"+this.amount.doubleValue()+""; + }else{ + return "-"+this.amount.doubleValue()+""; + } + } + + public String getCreateTimeDesc() { + return DateUtils.formatDate(this.getCreateTime(), "yyyy-MM-dd HH:mm:ss"); + } } \ No newline at end of file diff --git a/roncoo-pay-service/src/main/java/com/roncoo/pay/trade/dao/RpTradePaymentRecordDao.java b/roncoo-pay-service/src/main/java/com/roncoo/pay/trade/dao/RpTradePaymentRecordDao.java index ee997e8..afd5176 100644 --- a/roncoo-pay-service/src/main/java/com/roncoo/pay/trade/dao/RpTradePaymentRecordDao.java +++ b/roncoo-pay-service/src/main/java/com/roncoo/pay/trade/dao/RpTradePaymentRecordDao.java @@ -15,6 +15,9 @@ */ package com.roncoo.pay.trade.dao; +import java.util.List; +import java.util.Map; + import com.roncoo.pay.common.core.dao.BaseDao; import com.roncoo.pay.trade.entity.RpTradePaymentRecord; @@ -48,4 +51,8 @@ public interface RpTradePaymentRecordDao extends BaseDao{ */ RpTradePaymentRecord getByTrxNo(String trxNo); + List> getPaymentReport(String merchantNo); + + List> getPayWayReport(String merchantNo); + } diff --git a/roncoo-pay-service/src/main/java/com/roncoo/pay/trade/dao/impl/RpTradePaymentRecordDaoImpl.java b/roncoo-pay-service/src/main/java/com/roncoo/pay/trade/dao/impl/RpTradePaymentRecordDaoImpl.java index 56e9c45..84006c4 100644 --- a/roncoo-pay-service/src/main/java/com/roncoo/pay/trade/dao/impl/RpTradePaymentRecordDaoImpl.java +++ b/roncoo-pay-service/src/main/java/com/roncoo/pay/trade/dao/impl/RpTradePaymentRecordDaoImpl.java @@ -23,6 +23,7 @@ import com.roncoo.pay.trade.enums.TradeStatusEnum; import org.springframework.stereotype.Repository; import java.util.HashMap; +import java.util.List; import java.util.Map; /** @@ -73,5 +74,19 @@ public class RpTradePaymentRecordDaoImpl extends BaseDaoImpl> getPaymentReport(String merchantNo){ + Map paramMap = new HashMap(); + paramMap.put("status", TradeStatusEnum.SUCCESS.name()); + paramMap.put("merchantNo", merchantNo); + return super.getSqlSession().selectList(getStatement("getPaymentReport"),paramMap); + } + + public List> getPayWayReport(String merchantNo){ + Map paramMap = new HashMap(); + paramMap.put("status", TradeStatusEnum.SUCCESS.name()); + paramMap.put("merchantNo", merchantNo); + return super.getSqlSession().selectList(getStatement("getPayWayReport"),paramMap); + } } diff --git a/roncoo-pay-service/src/main/java/com/roncoo/pay/trade/entity/RpTradePaymentRecord.java b/roncoo-pay-service/src/main/java/com/roncoo/pay/trade/entity/RpTradePaymentRecord.java index 5c68a55..cea966a 100644 --- a/roncoo-pay-service/src/main/java/com/roncoo/pay/trade/entity/RpTradePaymentRecord.java +++ b/roncoo-pay-service/src/main/java/com/roncoo/pay/trade/entity/RpTradePaymentRecord.java @@ -15,12 +15,18 @@ */ package com.roncoo.pay.trade.entity; -import com.roncoo.pay.common.core.entity.BaseEntity; - import java.io.Serializable; import java.math.BigDecimal; import java.util.Date; +import com.roncoo.pay.common.core.entity.BaseEntity; +import com.roncoo.pay.common.core.enums.PayTypeEnum; +import com.roncoo.pay.common.core.enums.PayWayEnum; +import com.roncoo.pay.common.core.utils.DateUtils; +import com.roncoo.pay.trade.enums.TradeStatusEnum; +import com.roncoo.pay.trade.enums.TrxTypeEnum; +import com.roncoo.pay.user.enums.FundInfoTypeEnum; + /** * 功能说明:商户支付记录实体类 * @author Peter @@ -526,6 +532,22 @@ public class RpTradePaymentRecord extends BaseEntity implements Serializable { public void setBankReturnMsg(String bankReturnMsg) { this.bankReturnMsg = bankReturnMsg; } + + public String getTrxTypeDesc() { + return TrxTypeEnum.getEnum(this.getTrxType()).getDesc(); + } + + public String getPayWayNameDesc() { + return PayWayEnum.getEnum(this.getPayWayCode()).getDesc()+"-"+PayTypeEnum.getEnum(this.getPayTypeCode()).getDesc(); + } + + public String getStatusDesc() { + return TradeStatusEnum.getEnum(this.getStatus()).getDesc(); + } + + public String getCreateTimeDesc() { + return DateUtils.formatDate(this.getCreateTime(), "yyyy-MM-dd HH:mm"); + } @Override public String toString() { diff --git a/roncoo-pay-service/src/main/java/com/roncoo/pay/trade/service/RpTradePaymentQueryService.java b/roncoo-pay-service/src/main/java/com/roncoo/pay/trade/service/RpTradePaymentQueryService.java index ccebee1..a8198e2 100644 --- a/roncoo-pay-service/src/main/java/com/roncoo/pay/trade/service/RpTradePaymentQueryService.java +++ b/roncoo-pay-service/src/main/java/com/roncoo/pay/trade/service/RpTradePaymentQueryService.java @@ -85,5 +85,21 @@ public interface RpTradePaymentQueryService { * @return */ public PageBean listPaymentRecordPage(PageParam pageParam ,PaymentOrderQueryParam paymentOrderQueryParam); + + /** + * 获取交易流水报表 + * + * @param merchantNo + * @return + */ + public List> getPaymentReport(String merchantNo); + + /** + * 获取交易方式报表 + * + * @param merchantNo + * @return + */ + public List> getPayWayReport(String merchantNo); } diff --git a/roncoo-pay-service/src/main/java/com/roncoo/pay/trade/service/impl/RpTradePaymentQueryServiceImpl.java b/roncoo-pay-service/src/main/java/com/roncoo/pay/trade/service/impl/RpTradePaymentQueryServiceImpl.java index 616cf62..dfd7e36 100644 --- a/roncoo-pay-service/src/main/java/com/roncoo/pay/trade/service/impl/RpTradePaymentQueryServiceImpl.java +++ b/roncoo-pay-service/src/main/java/com/roncoo/pay/trade/service/impl/RpTradePaymentQueryServiceImpl.java @@ -231,4 +231,24 @@ public class RpTradePaymentQueryServiceImpl implements RpTradePaymentQueryServic return rpTradePaymentRecordDao.listPage(pageParam,paramMap); } + + /** + * 获取交易流水报表 + * + * @param merchantNo + * @return + */ + public List> getPaymentReport(String merchantNo){ + return rpTradePaymentRecordDao.getPaymentReport(merchantNo); + } + + /** + * 获取交易方式报表 + * + * @param merchantNo + * @return + */ + public List> getPayWayReport(String merchantNo){ + return rpTradePaymentRecordDao.getPayWayReport(merchantNo); + } } diff --git a/roncoo-pay-service/src/main/java/com/roncoo/pay/user/entity/RpUserInfo.java b/roncoo-pay-service/src/main/java/com/roncoo/pay/user/entity/RpUserInfo.java index 59c6eec..1a9fc7c 100644 --- a/roncoo-pay-service/src/main/java/com/roncoo/pay/user/entity/RpUserInfo.java +++ b/roncoo-pay-service/src/main/java/com/roncoo/pay/user/entity/RpUserInfo.java @@ -34,9 +34,29 @@ public class RpUserInfo extends BaseEntity implements Serializable { private String accountNo; private static final long serialVersionUID = 1L; + + private String mobile; + + private String password; - public String getUserNo() { + public String getMobile() { + return mobile; + } + + public void setMobile(String mobile) { + this.mobile = mobile; + } + + public String getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } + + public String getUserNo() { return userNo; } diff --git a/roncoo-pay-service/src/main/java/com/roncoo/pay/user/service/RpUserInfoService.java b/roncoo-pay-service/src/main/java/com/roncoo/pay/user/service/RpUserInfoService.java index 9ab7431..5260d4f 100644 --- a/roncoo-pay-service/src/main/java/com/roncoo/pay/user/service/RpUserInfoService.java +++ b/roncoo-pay-service/src/main/java/com/roncoo/pay/user/service/RpUserInfoService.java @@ -60,9 +60,13 @@ public interface RpUserInfoService{ * * @param userName * 用户名 + * @param mobile + * 手机号 + * @param password + * 密码 * @return */ - void registerOffline(String userName) ; + void registerOffline(String userName, String mobile, String password) ; /** * 根据商户编号获取商户信息 @@ -71,6 +75,13 @@ public interface RpUserInfoService{ */ RpUserInfo getDataByMerchentNo(String merchantNo); + /** + * 根据手机号获取商户信息 + * @param mobile + * @return + */ + RpUserInfo getDataByMobile(String mobile); + /** * 获取所有用户 * @return diff --git a/roncoo-pay-service/src/main/java/com/roncoo/pay/user/service/impl/RpUserInfoServiceImpl.java b/roncoo-pay-service/src/main/java/com/roncoo/pay/user/service/impl/RpUserInfoServiceImpl.java index 99c8244..f382cbf 100644 --- a/roncoo-pay-service/src/main/java/com/roncoo/pay/user/service/impl/RpUserInfoServiceImpl.java +++ b/roncoo-pay-service/src/main/java/com/roncoo/pay/user/service/impl/RpUserInfoServiceImpl.java @@ -30,6 +30,7 @@ import com.roncoo.pay.account.service.RpAccountService; import com.roncoo.pay.common.core.enums.PublicStatusEnum; import com.roncoo.pay.common.core.page.PageBean; import com.roncoo.pay.common.core.page.PageParam; +import com.roncoo.pay.common.core.utils.EncryptUtil; import com.roncoo.pay.common.core.utils.StringUtil; import com.roncoo.pay.user.dao.RpUserInfoDao; import com.roncoo.pay.user.entity.RpUserInfo; @@ -80,11 +81,15 @@ public class RpUserInfoServiceImpl implements RpUserInfoService{ * * @param userName * 用户名 + * @param mobile + * 手机号 + * @param password + * 密码 * @return */ @Override @Transactional(rollbackFor = Exception.class) - public void registerOffline(String userName) { + public void registerOffline(String userName, String mobile, String password) { String userNo = buildNoService.buildUserNo(); String accountNo = buildNoService.buildAccountNo(); @@ -96,6 +101,8 @@ public class RpUserInfoServiceImpl implements RpUserInfoService{ rpUserInfo.setStatus(PublicStatusEnum.ACTIVE.name()); rpUserInfo.setUserName(userName); rpUserInfo.setUserNo(userNo); + rpUserInfo.setMobile(mobile); + rpUserInfo.setPassword(EncryptUtil.encodeMD5String(password)); rpUserInfo.setVersion(0); this.saveData(rpUserInfo); @@ -133,6 +140,19 @@ public class RpUserInfoServiceImpl implements RpUserInfoService{ return rpUserInfoDao.getBy(paramMap); } + /** + * 根据手机号获取商户信息 + * @param mobile + * @return + */ + @Override + public RpUserInfo getDataByMobile(String mobile){ + Map paramMap = new HashMap(); + paramMap.put("mobile", mobile); + paramMap.put("status", PublicStatusEnum.ACTIVE.name()); + return rpUserInfoDao.getBy(paramMap); + } + /** * 获取所有用户 * @return diff --git a/roncoo-pay-service/src/main/java/com/roncoo/pay/user/service/impl/RpUserPayConfigServiceImpl.java b/roncoo-pay-service/src/main/java/com/roncoo/pay/user/service/impl/RpUserPayConfigServiceImpl.java index 46169f5..20d0f5f 100644 --- a/roncoo-pay-service/src/main/java/com/roncoo/pay/user/service/impl/RpUserPayConfigServiceImpl.java +++ b/roncoo-pay-service/src/main/java/com/roncoo/pay/user/service/impl/RpUserPayConfigServiceImpl.java @@ -22,6 +22,7 @@ import java.util.Map; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import com.roncoo.pay.common.core.enums.PayWayEnum; import com.roncoo.pay.common.core.enums.PublicEnum; @@ -134,6 +135,7 @@ public class RpUserPayConfigServiceImpl implements RpUserPayConfigService{ * 创建用户支付配置 */ @Override + @Transactional(rollbackFor = Exception.class) public void createUserPayConfig(String userNo, String userName, String productCode, String productName, Integer riskDay, String fundIntoType, String isAutoSett, String appId, String merchantId, String partnerKey, String ali_partner, String ali_sellerId, String ali_key, String ali_appid, String ali_rsaPrivateKey, String ali_rsaPublicKey) throws PayBizException{ diff --git a/roncoo-pay-service/src/main/resources/jdbc.properties b/roncoo-pay-service/src/main/resources/jdbc.properties index 5417ef2..a3bfdf8 100644 --- a/roncoo-pay-service/src/main/resources/jdbc.properties +++ b/roncoo-pay-service/src/main/resources/jdbc.properties @@ -3,7 +3,6 @@ jdbc.url=jdbc:mysql://192.168.1.215:3306/roncoo_mini_pay_dev?useUnicode=true&cha jdbc.username=root jdbc.password=www.roncoo.com - #初始化连接大小 jdbc.initialSize=0 #连接池最大数量 diff --git a/roncoo-pay-service/src/main/resources/log4j.properties b/roncoo-pay-service/src/main/resources/log4j.properties index bafbbc5..ef7159d 100644 --- a/roncoo-pay-service/src/main/resources/log4j.properties +++ b/roncoo-pay-service/src/main/resources/log4j.properties @@ -10,7 +10,7 @@ log4j.appender.Console.layout.ConversionPattern=[%-5p][%d{yyyy-MM-dd HH\:mm\:ss, #文件大小到达指定尺寸的时候产生一个新的文件 log4j.appender.File = org.apache.log4j.RollingFileAppender -log4j.appender.File.File = logs/ +log4j.appender.File.File = logs/roncoo-pay-service.log log4j.appender.File.DatePattern='-'yyyy-MM-dd'.log' log4j.appender.File.Threshold=info log4j.appender.File.layout=org.apache.log4j.PatternLayout diff --git a/roncoo-pay-service/src/main/resources/mybatis/mapper/trade/RpTradePaymentRecordMapper.xml b/roncoo-pay-service/src/main/resources/mybatis/mapper/trade/RpTradePaymentRecordMapper.xml index d70d0ce..a5b7a6a 100644 --- a/roncoo-pay-service/src/main/resources/mybatis/mapper/trade/RpTradePaymentRecordMapper.xml +++ b/roncoo-pay-service/src/main/resources/mybatis/mapper/trade/RpTradePaymentRecordMapper.xml @@ -235,4 +235,21 @@ + + + + \ No newline at end of file diff --git a/roncoo-pay-service/src/main/resources/mybatis/mapper/user/RpUserInfoMapper.xml b/roncoo-pay-service/src/main/resources/mybatis/mapper/user/RpUserInfoMapper.xml index edc6740..f83906c 100644 --- a/roncoo-pay-service/src/main/resources/mybatis/mapper/user/RpUserInfoMapper.xml +++ b/roncoo-pay-service/src/main/resources/mybatis/mapper/user/RpUserInfoMapper.xml @@ -8,6 +8,8 @@ + + id, create_time, status, user_no, user_name, account_no @@ -24,10 +26,11 @@ insert into rp_user_info (id, create_time, status, - user_no, user_name, account_no + user_no, user_name, account_no, mobile, password ) values (#{id,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{status,jdbcType=VARCHAR}, - #{userNo,jdbcType=VARCHAR}, #{userName,jdbcType=VARCHAR}, #{accountNo,jdbcType=VARCHAR} + #{userNo,jdbcType=VARCHAR}, #{userName,jdbcType=VARCHAR}, #{accountNo,jdbcType=VARCHAR}, + #{mobile,jdbcType=VARCHAR}, #{password,jdbcType=VARCHAR} ) @@ -37,7 +40,9 @@ status = #{status,jdbcType=VARCHAR}, user_no = #{userNo,jdbcType=VARCHAR}, user_name = #{userName,jdbcType=VARCHAR}, - account_no = #{accountNo,jdbcType=VARCHAR} + account_no = #{accountNo,jdbcType=VARCHAR}, + mobile = #{mobile,jdbcType=VARCHAR}, + password = #{password,jdbcType=VARCHAR} where id = #{id,jdbcType=VARCHAR} @@ -47,6 +52,7 @@ and status = #{status,jdbcType=VARCHAR} and user_no = #{userNo,jdbcType=VARCHAR} + and mobile = #{mobile,jdbcType=VARCHAR} +
+
手机号：
+
+ +
+
+
+
登录密码：
+
+ +
+
diff --git a/roncoo-pay-web-gateway/pom.xml b/roncoo-pay-web-gateway/pom.xml index 0f9f0bb..bdd3542 100644 --- a/roncoo-pay-web-gateway/pom.xml +++ b/roncoo-pay-web-gateway/pom.xml @@ -3,7 +3,7 @@ roncoo-pay com.roncoo.pay.common - 0.0.4-SNAPSHOT + 1.0.0-SNAPSHOT 4.0.0 roncoo-pay-web-gateway diff --git a/roncoo-pay-web-gateway/src/main/resources/log4j.properties b/roncoo-pay-web-gateway/src/main/resources/log4j.properties index d1a47cd..47b25ef 100644 --- a/roncoo-pay-web-gateway/src/main/resources/log4j.properties +++ b/roncoo-pay-web-gateway/src/main/resources/log4j.properties @@ -10,7 +10,7 @@ log4j.appender.Console.layout.ConversionPattern=[%-5p][%d{yyyy-MM-dd HH\:mm\:ss, #文件大小到达指定尺寸的时候产生一个新的文件 log4j.appender.File = org.apache.log4j.RollingFileAppender -log4j.appender.File.File = logs/ +log4j.appender.File.File = logs/roncoo-pay-web-gateway.log log4j.appender.File.DatePattern='-'yyyy-MM-dd'.log' log4j.appender.File.Threshold=info log4j.appender.File.layout=org.apache.log4j.PatternLayout