czg_team/cashier-admin-java
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'test' into dev

Browse Source 
# Conflicts:
#	eladmin-system/src/main/java/cn/ysk/cashier/config/security/config/bean/LoginProperties.java
#	eladmin-system/src/main/resources/config/application-pre.yml
This commit is contained in:
wangw
2024-09-09 09:59:01 +08:00
parent 4bd99e7f6e c618c712f3
commit fec443ce6c
49 changed files with 1671 additions and 626 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
eladmin-system/src/main/resources/config/application-pre.yml
View File

@@ -4,6 +4,7 @@ spring:
druid:
db-type: com.alibaba.druid.pool.DruidDataSource
# driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
#内网地址
url: jdbc:mysql://rm-bp1kn7h89nz62cno1ro.mysql.rds.aliyuncs.com:3306/fycashier_pre?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useJDBCCompliantTimezoneShift=true&serverTimezone=Asia/Shanghai&useSSL=false&allowMultiQueries=true
# url: jdbc:mysql://127.0.0.1:3306/fycashier?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useJDBCCompliantTimezoneShift=true&serverTimezone=Asia/Shanghai&useSSL=false&allowMultiQueries=true
username: cashier

8
eladmin-system/src/main/resources/config/application.yml
View File

@@ -60,6 +60,8 @@ qrcode: https://kysh.sxczgkj.cn/codeplate?code=
thirdPay:
groupCallBack: https://wxcashiertest.sxczgkj.cn/cashierService/notify/notifyCallBackGroup
payType: fushangtong
callBack: https://cashierclient.sxczgkj.cn/cashier-client/notify/notifyPay
url: https://paymentapi.sxczgkj.cn
mybatis-plus:
@@ -85,3 +87,9 @@ wx:
secrete: 8492a7e8d55bbb1b57f5c8276ea1add0
operationMsgTmpId: wFdoUG-dUT7bDRHq8bMJD9CF5TjyH9x_uJQgQByZqHg
warnMsgTmpId: C08OUr80x6wGmUN1zpFhSQ3Sv7VF5vksdZigiEx2pD0
gateway:
url: https://gateway.api.sxczgkj.cn/gate-service/
client:
backUrl: https://cashierclient.sxczgkj.cn/cashier-client/notify/notifyPay

23
eladmin-system/src/main/resources/mapper/TbActivateMapper.xml Normal file
View File

@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cn.ysk.cashier.mybatis.mapper.TbActivateMapper">
<resultMap id="BaseResultMap" type="cn.ysk.cashier.mybatis.pojo.TbActivatetb">
<id property="id" column="id" jdbcType="INTEGER"/>
<result property="shop_id" column="shop_id" jdbcType="INTEGER"/>
<result property="min_num" column="min_num" jdbcType="INTEGER"/>
<result property="max_num" column="max_num" jdbcType="INTEGER"/>
<result property="handsel_num" column="handsel_num" jdbcType="DECIMAL"/>
<result property="handsel_type" column="handsel_type" jdbcType="VARCHAR"/>
<result property="is_del" column="is_del" jdbcType="VARCHAR"/>
<result property="is_user" column="is_user" jdbcType="VARCHAR"/>
</resultMap>
<sql id="Base_Column_List">
id,shop_id,min_num,
max_num,handsel_num,handsel_type,
is_del,is_user
</sql>
</mapper>