Merge branch 'hotfix/1.0.33'
diff --git a/payapi/src/main/kotlin/com/supwisdom/dlpay/api/controller/user_api_controller.kt b/payapi/src/main/kotlin/com/supwisdom/dlpay/api/controller/user_api_controller.kt
index 8d8fb8f..3aff51f 100644
--- a/payapi/src/main/kotlin/com/supwisdom/dlpay/api/controller/user_api_controller.kt
+++ b/payapi/src/main/kotlin/com/supwisdom/dlpay/api/controller/user_api_controller.kt
@@ -1,5 +1,6 @@
package com.supwisdom.dlpay.api.controller
+import com.google.gson.Gson
import com.supwisdom.dlpay.agent.citizencard.YnrccUtil
import com.supwisdom.dlpay.agent.service.CitizencardPayService
import com.supwisdom.dlpay.api.bean.*
@@ -13,10 +14,10 @@
import com.supwisdom.dlpay.system.bean.LevelBean
import com.supwisdom.dlpay.system.service.PointsService
import com.supwisdom.dlpay.system.service.UserMessageService
+import mu.KotlinLogging
import org.apache.commons.beanutils.BeanUtils
import org.springframework.beans.factory.annotation.Autowired
import org.springframework.http.ResponseEntity
-import org.springframework.validation.annotation.Validated
import org.springframework.web.bind.annotation.*
import java.net.URLDecoder
import javax.validation.Valid
@@ -45,6 +46,8 @@
@Autowired
private lateinit var userMessageService: UserMessageService
+ private val logger = KotlinLogging.logger { }
+
@PostMapping("/open")
fun openAccount(@RequestBody param: OpenUserParam): ResponseEntity<Any> {
try {
@@ -295,6 +298,8 @@
*/
@PostMapping("/bindcard")
fun bindCard(@RequestBody param: BindCardParam):ResponseEntity<Any>{
+ val logStr = Gson().toJson(param)
+ logger.info("bindcard params:$logStr")
val card = mobileApiService.findCardByNo(param.cardno)
?: return ResponseEntity.ok(ResponseBodyBuilder.create()
.fail(400, "银行卡号有误"))
diff --git a/payapi/src/main/resources/static/custom/css/login.css b/payapi/src/main/resources/static/custom/css/login.css
index 60c4cf0..f3f841d 100644
--- a/payapi/src/main/resources/static/custom/css/login.css
+++ b/payapi/src/main/resources/static/custom/css/login.css
@@ -138,4 +138,12 @@
.inline-block {
display: inline-block;
+}
+
+a.logo_police{
+ background-image: url("../images/logo_police.jpg");
+ background-repeat: no-repeat;
+ background-size: cover;
+ text-decoration: none;
+ font-size: 13px;
}
\ No newline at end of file
diff --git a/payapi/src/main/resources/static/custom/images/logo_police.jpg b/payapi/src/main/resources/static/custom/images/logo_police.jpg
new file mode 100644
index 0000000..9fa1424
--- /dev/null
+++ b/payapi/src/main/resources/static/custom/images/logo_police.jpg
Binary files differ
diff --git a/payapi/src/main/resources/templates/login.html b/payapi/src/main/resources/templates/login.html
index a87ae82..562ecc2 100644
--- a/payapi/src/main/resources/templates/login.html
+++ b/payapi/src/main/resources/templates/login.html
@@ -72,12 +72,10 @@
</div>
<div class="login-footer">
- <p>© 2019 <a href="javascript:;" target="_blank">上海树维信息科技有限公司 版权所有</a></p>
- <!--<p>-->
- <!--<span><a href="javascript:;" target="_blank">前往github</a></span>-->
- <!--<span><a href="https://gitee.com/andyzy/zy-admin.git" target="_blank">前往gitee</a></span>-->
- <!--<span><a href="javascript:;" target="_blank">文档说明</a></span>-->
- <!--</p>-->
+ <p>© 2019 <a href="http://www.supwisdom.com" target="_blank">上海树维信息科技有限公司 版权所有</a></p>
+ <p>
+ <span><a href="https://beian.miit.gov.cn" target="_blank" style="padding: 0 2px;">网站备案许可证号: 滇ICP备14007616号-1</a><a href="javascript:void(0);" class="logo_police"> </a><a href="http://www.beian.gov.cn" target="_blank" style="padding: 0 2px;">公安备案号: 53290102000322</a></span>
+ </p>
</div>
</div>
diff --git a/payapi/src/main/resources/templates/ologin.html b/payapi/src/main/resources/templates/ologin.html
index ac043c3..b9633b2 100644
--- a/payapi/src/main/resources/templates/ologin.html
+++ b/payapi/src/main/resources/templates/ologin.html
@@ -70,12 +70,10 @@
</div>
<div class="login-footer">
- <p>© 2019 <a href="javascript:;" target="_blank">上海树维信息科技有限公司 版权所有</a></p>
- <!--<p>-->
- <!--<span><a href="javascript:;" target="_blank">前往github</a></span>-->
- <!--<span><a href="https://gitee.com/andyzy/zy-admin.git" target="_blank">前往gitee</a></span>-->
- <!--<span><a href="javascript:;" target="_blank">文档说明</a></span>-->
- <!--</p>-->
+ <p>© 2019 <a href="http://www.supwisdom.com" target="_blank">上海树维信息科技有限公司 版权所有</a></p>
+ <p>
+ <span><a href="https://beian.miit.gov.cn" target="_blank" style="padding: 0 2px;">网站备案许可证号: 滇ICP备14007616号-1</a><a href="javascript:void(0);" class="logo_police"> </a><a href="http://www.beian.gov.cn" target="_blank" style="padding: 0 2px;">公安备案号: 53290102000322</a></span>
+ </p>
</div>
</div>
