java/haizhentong.git

parent: 2946718f | 补丁 | 提交 | ignore whitespace

Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/haizhentong

liujie

2025-10-29 f5c17be72d3909b3626e738a3ad92fd1841d2acb

Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/haizhentong

6个文件已修改

	ruoyi-admin/pom.xml	24 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TOrderController.java	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-admin/src/main/resources/application-prod.yml	22 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-admin/src/main/resources/application.yml	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-applet/src/main/resources/application-prod.yml	22 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-applet/src/main/resources/application.yml	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 ruoyi-admin/pom.xml

@@ -173,6 +173,16 @@
            <artifactId>thumbnailator</artifactId>
            <version>0.4.8</version>
        </dependency>

        <!--引入lib的jar包-->
        <dependency>
            <groupId>com.lkl.laop.sdk</groupId>
            <artifactId>lkl-java-sdk</artifactId>
            <version>1.0.7</version>
            <scope>system</scope>
            <systemPath>${project.basedir}/lib/lkl-java-sdk-1.0.7.jar</systemPath>
        </dependency>

    </dependencies>

    <build>
@@ -183,6 +193,7 @@
                <version>2.5.15</version>
                <configuration>
                    <fork>true</fork> <!-- 如果没有该配置，devtools不会生效 -->
                    <includeSystemScope>true</includeSystemScope>
                </configuration>
                <executions>
                    <execution>
@@ -202,6 +213,19 @@
                </configuration>   
           </plugin>   
        </plugins>
        <resources>
            <resource>
                <directory>src/main/resources</directory>
                <filtering>true</filtering>
            </resource>
            <resource>
                <directory>lib</directory>
                <targetPath>BOOT-INF/lib/</targetPath>
                <includes>
                    <include>**/*.jar</include>
                </includes>
            </resource>
        </resources>
        <finalName>${project.artifactId}</finalName>
    </build>


 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TOrderController.java

@@ -139,7 +139,7 @@
                    "\t\t\"out_trade_no\": \"" + outTradeNo + "\",\n" +
                    "\t\t\"merchant_no\": \""+supplier.getRecvMerchantNo()+"\",\n" +
                    "\t\t\"term_no\": \""+supplier.getTermNo()+"\",\n" +
                    "\t\t\"notify_url\": \"http://221.182.45.100:8089/t-sys-order/messageHandle\",\n" +
                    "\t\t\"notify_url\": \"https://haizhentong.com/manage/t-sys-order/messageHandle\",\n" +
                    "\t\t\"location_info\": {\n" +
                    "\t\t\t\"request_ip\": \"" + ipAddr + "\"\n" +
                    "\t\t},\n" +
@@ -231,7 +231,7 @@
            map.put("log_no", erpProcurement.getPayTransactionId());
            map.put("log_date", DateUtils.dateTime());
            map.put("cal_type", "0");
            map.put("notify_url", "http://221.182.45.100:8089/t-sys-order/messageSeparateHandle");
            map.put("notify_url", "https://haizhentong.com/manage/t-sys-order/messageSeparateHandle");
            String time = DateUtils.dateTimeNow();

            // SYMBOLS 随机取4位数
@@ -382,7 +382,7 @@
                        "\t\t\"out_trade_no\": \"" + outTradeNo + "\",\n" +
                        "\t\t\"refund_amount\": \"" + refund_amount + "\",\n" +
                        "\t\t\"refund_reason\": \"退款\",\n" +
                        "\t\t\"notify_url\": \"" + "http://221.182.45.100:8089/t-sys-order/messageRefundHandle" + "\",\n" +
                        "\t\t\"notify_url\": \"" + "https://haizhentong.com/manage/t-sys-order/messageRefundHandle" + "\",\n" +
                        "\t\t\"origin_out_trade_no\": \"" + erpProcurement.getPayNumber() + "\",\n" +
                        "\t\t\"refund_acc_mode\": \"00\",\n" +
                        "\t\t\"refund_amt_sts\": \"00\",\n" +
@@ -487,7 +487,7 @@
                        "\t\t\"out_trade_no\": \"" + outTradeNo + "\",\n" +
                        "\t\t\"refund_amount\": \"" + refund_amount + "\",\n" +
                        "\t\t\"refund_reason\": \"退款\",\n" +
                        "\t\t\"notify_url\": \"" + "http://221.182.45.100:8089/t-sys-order/messageRefundHandle" + "\",\n" +
                        "\t\t\"notify_url\": \"" + "https://haizhentong.com/manage/t-sys-order/messageRefundHandle" + "\",\n" +
                        "\t\t\"origin_out_trade_no\": \"" + erpProcurement.getPayNumber() + "\",\n" +
                        "\t\t\"refund_acc_mode\": \"00\",\n" +
                        "\t\t\"refund_amt_sts\": \"00\",\n" +

 ruoyi-admin/src/main/resources/application-prod.yml

@@ -17,10 +17,10 @@
# 开发环境配置
server:
  # 服务器的HTTP端口，默认为8080
  port: 8088
  port: 8089
  servlet:
    # 应用的访问路径
    context-path: /
    context-path: /manage
  tomcat:
    # tomcat的URI编码
    uri-encoding: UTF-8
@@ -78,11 +78,11 @@
#    password: 123456
    host: 127.0.0.1
    # 端口，默认为6379
    port: 16379
    port: 10644
    # 数据库索引
    database: 1
    # 密码
    password: Chenkun@2025Redis!
    password: Haizhentong@2025Redis!
    # 连接超时时间
    timeout: 10s
    lettuce:
@@ -104,7 +104,7 @@
      master:
        url: jdbc:mysql://127.0.0.1:10633/haizhentong?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
        username: root
        password: Chenkun@2025Mysql!
        password: Haizhentong@2025Mysql!
      # 从库数据源
      slave:
        # 从数据源开关/默认关闭
@@ -211,8 +211,8 @@
  subAppId: 1
  appId: OP00000003
  serialNo: 00dfba8194c41b84cf
  priKeyStr: D:\lakalapay\OP00000003_private_key.pem
  lklNotifyCerStr: D:\lakalapay\lkl-apigw-v2.cer
  priKeyStr: /usr/local/project/cert/lakala/OP00000003_private_key.pem
  lklNotifyCerStr: /usr/local/project/cert/lakala/lkl-apigw-v2.cer
  sm4Key: LHo55AjrT4aDhAIBZhb5KQ==
  serverUrl: https://test.wsmsd.cn/
payment:
@@ -227,14 +227,14 @@
      # 加签串
      apiKey: V7mKp9qL2Rs4jU6tX8wZ0bC3eF5hN1yD4gA
      # 加签证书地址
      privateKeyPath: D:/app/cert/weixin/apiclient_key.pem
      privateKeyPath: /usr/local/project/cert/weixin/apiclient_key.pem
      # 微信支付公钥id
      publicKeyId: PUB_KEY_ID_0117217579152025091800181718000000
      # 微信支付公钥证书
      publicKeyPath: D:/app/cert/weixin/apiclient_cert.pem
      publicKeyPath: /usr/local/project/cert/weixin/apiclient_cert.pem
      # 证书序列号
      mchSerialNo: 39C7F6152E38A62B5786634D5C1F984FB5A38AD5
      # 支付成功回调地址
      notifyPayUrl: http://221.182.45.100/wx/pay/notify
      notifyPayUrl: https://haizhentong.com/applet/wx/pay/notify
      # 支付退款回调地址
      notifyRefundUrl: http://221.182.45.100/wx/refund/notify
      notifyRefundUrl: https://haizhentong.com/applet/wx/refund/notify

 ruoyi-admin/src/main/resources/application.yml

@@ -1,4 +1,4 @@
# 项目相关配置
spring:
  profiles:
    active: test
    active: prod

 ruoyi-applet/src/main/resources/application-prod.yml

@@ -18,10 +18,10 @@
# 开发环境配置
server:
  # 服务器的HTTP端口，默认为8080
  port: 8089
  port: 8088
  servlet:
    # 应用的访问路径
    context-path: /
    context-path: /applet
  tomcat:
    # tomcat的URI编码
    uri-encoding: UTF-8
@@ -79,11 +79,11 @@
#    password: 123456
    host: 127.0.0.1
    # 端口，默认为6379
    port: 16379
    port: 10644
    # 数据库索引
    database: 1
    # 密码
    password: Chenkun@2025Redis!
    password: Haizhentong@2025Redis!
    # 连接超时时间
    timeout: 10s
    lettuce:
@@ -105,7 +105,7 @@
      master:
        url: jdbc:mysql://127.0.0.1:10633/haizhentong?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
        username: root
        password: Chenkun@2025Mysql!
        password: Haizhentong@2025Mysql!
      # 从库数据源
      slave:
        # 从数据源开关/默认关闭
@@ -227,10 +227,14 @@
      # 加签串
      apiKey: V7mKp9qL2Rs4jU6tX8wZ0bC3eF5hN1yD4gA
      # 加签证书地址
      privateKeyPath: D:/app/cert/weixin/apiclient_key.pem
      privateKeyPath: /usr/local/project/cert/weixin/apiclient_key.pem
      # 微信支付公钥id
      publicKeyId: PUB_KEY_ID_0117217579152025091800181718000000
      # 微信支付公钥证书
      publicKeyPath: /usr/local/project/cert/weixin/apiclient_cert.pem
      # 证书序列号
      mchSerialNo: 52C3F27D42CB31E70F93C2E9A3FF4F0BD845EA6B
      mchSerialNo: 39C7F6152E38A62B5786634D5C1F984FB5A38AD5
      # 支付成功回调地址
      notifyPayUrl: http://221.182.45.100/wx/pay/notify
      notifyPayUrl: https://haizhentong.com/applet/wx/pay/notify
      # 支付退款回调地址
      notifyRefundUrl: http://221.182.45.100/wx/refund/notify
      notifyRefundUrl: https://haizhentong.com/applet/wx/refund/notify

 ruoyi-applet/src/main/resources/application.yml

@@ -1,4 +1,4 @@
# 项目相关配置
spring:
  profiles:
    active: test
    active: prod

			@@ -173,6 +173,16 @@
			<artifactId>thumbnailator</artifactId>
			<version>0.4.8</version>
			</dependency>

			<!--引入lib的jar包-->
			<dependency>
			<groupId>com.lkl.laop.sdk</groupId>
			<artifactId>lkl-java-sdk</artifactId>
			<version>1.0.7</version>
			<scope>system</scope>
			<systemPath>${project.basedir}/lib/lkl-java-sdk-1.0.7.jar</systemPath>
			</dependency>

			</dependencies>

			<build>
			@@ -183,6 +193,7 @@
			<version>2.5.15</version>
			<configuration>
			<fork>true</fork> <!-- 如果没有该配置，devtools不会生效 -->
			<includeSystemScope>true</includeSystemScope>
			</configuration>
			<executions>
			<execution>
			@@ -202,6 +213,19 @@
			</configuration>
			</plugin>
			</plugins>
			<resources>
			<resource>
			<directory>src/main/resources</directory>
			<filtering>true</filtering>
			</resource>
			<resource>
			<directory>lib</directory>
			<targetPath>BOOT-INF/lib/</targetPath>
			<includes>
			<include>*/.jar</include>
			</includes>
			</resource>
			</resources>
			<finalName>${project.artifactId}</finalName>
			</build>

			@@ -139,7 +139,7 @@
			"\t\t\"out_trade_no\": \"" + outTradeNo + "\",\n" +
			"\t\t\"merchant_no\": \""+supplier.getRecvMerchantNo()+"\",\n" +
			"\t\t\"term_no\": \""+supplier.getTermNo()+"\",\n" +
			"\t\t\"notify_url\": \"http://221.182.45.100:8089/t-sys-order/messageHandle\",\n" +
			"\t\t\"notify_url\": \"https://haizhentong.com/manage/t-sys-order/messageHandle\",\n" +
			"\t\t\"location_info\": {\n" +
			"\t\t\t\"request_ip\": \"" + ipAddr + "\"\n" +
			"\t\t},\n" +
			@@ -231,7 +231,7 @@
			map.put("log_no", erpProcurement.getPayTransactionId());
			map.put("log_date", DateUtils.dateTime());
			map.put("cal_type", "0");
			map.put("notify_url", "http://221.182.45.100:8089/t-sys-order/messageSeparateHandle");
			map.put("notify_url", "https://haizhentong.com/manage/t-sys-order/messageSeparateHandle");
			String time = DateUtils.dateTimeNow();

			// SYMBOLS 随机取4位数
			@@ -382,7 +382,7 @@
			"\t\t\"out_trade_no\": \"" + outTradeNo + "\",\n" +
			"\t\t\"refund_amount\": \"" + refund_amount + "\",\n" +
			"\t\t\"refund_reason\": \"退款\",\n" +
			"\t\t\"notify_url\": \"" + "http://221.182.45.100:8089/t-sys-order/messageRefundHandle" + "\",\n" +
			"\t\t\"notify_url\": \"" + "https://haizhentong.com/manage/t-sys-order/messageRefundHandle" + "\",\n" +
			"\t\t\"origin_out_trade_no\": \"" + erpProcurement.getPayNumber() + "\",\n" +
			"\t\t\"refund_acc_mode\": \"00\",\n" +
			"\t\t\"refund_amt_sts\": \"00\",\n" +
			@@ -487,7 +487,7 @@
			"\t\t\"out_trade_no\": \"" + outTradeNo + "\",\n" +
			"\t\t\"refund_amount\": \"" + refund_amount + "\",\n" +
			"\t\t\"refund_reason\": \"退款\",\n" +
			"\t\t\"notify_url\": \"" + "http://221.182.45.100:8089/t-sys-order/messageRefundHandle" + "\",\n" +
			"\t\t\"notify_url\": \"" + "https://haizhentong.com/manage/t-sys-order/messageRefundHandle" + "\",\n" +
			"\t\t\"origin_out_trade_no\": \"" + erpProcurement.getPayNumber() + "\",\n" +
			"\t\t\"refund_acc_mode\": \"00\",\n" +
			"\t\t\"refund_amt_sts\": \"00\",\n" +

			@@ -17,10 +17,10 @@
			# 开发环境配置
			server:
			# 服务器的HTTP端口，默认为8080
			port: 8088
			port: 8089
			servlet:
			# 应用的访问路径
			context-path: /
			context-path: /manage
			tomcat:
			# tomcat的URI编码
			uri-encoding: UTF-8
			@@ -78,11 +78,11 @@
			# password: 123456
			host: 127.0.0.1
			# 端口，默认为6379
			port: 16379
			port: 10644
			# 数据库索引
			database: 1
			# 密码
			password: Chenkun@2025Redis!
			password: Haizhentong@2025Redis!
			# 连接超时时间
			timeout: 10s
			lettuce:
			@@ -104,7 +104,7 @@
			master:
			url: jdbc:mysql://127.0.0.1:10633/haizhentong?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
			username: root
			password: Chenkun@2025Mysql!
			password: Haizhentong@2025Mysql!
			# 从库数据源
			slave:
			# 从数据源开关/默认关闭
			@@ -211,8 +211,8 @@
			subAppId: 1
			appId: OP00000003
			serialNo: 00dfba8194c41b84cf
			priKeyStr: D:\lakalapay\OP00000003_private_key.pem
			lklNotifyCerStr: D:\lakalapay\lkl-apigw-v2.cer
			priKeyStr: /usr/local/project/cert/lakala/OP00000003_private_key.pem
			lklNotifyCerStr: /usr/local/project/cert/lakala/lkl-apigw-v2.cer
			sm4Key: LHo55AjrT4aDhAIBZhb5KQ==
			serverUrl: https://test.wsmsd.cn/
			payment:
			@@ -227,14 +227,14 @@
			# 加签串
			apiKey: V7mKp9qL2Rs4jU6tX8wZ0bC3eF5hN1yD4gA
			# 加签证书地址
			privateKeyPath: D:/app/cert/weixin/apiclient_key.pem
			privateKeyPath: /usr/local/project/cert/weixin/apiclient_key.pem
			# 微信支付公钥id
			publicKeyId: PUB_KEY_ID_0117217579152025091800181718000000
			# 微信支付公钥证书
			publicKeyPath: D:/app/cert/weixin/apiclient_cert.pem
			publicKeyPath: /usr/local/project/cert/weixin/apiclient_cert.pem
			# 证书序列号
			mchSerialNo: 39C7F6152E38A62B5786634D5C1F984FB5A38AD5
			# 支付成功回调地址
			notifyPayUrl: http://221.182.45.100/wx/pay/notify
			notifyPayUrl: https://haizhentong.com/applet/wx/pay/notify
			# 支付退款回调地址
			notifyRefundUrl: http://221.182.45.100/wx/refund/notify
			notifyRefundUrl: https://haizhentong.com/applet/wx/refund/notify

			@@ -1,4 +1,4 @@
			# 项目相关配置
			spring:
			profiles:
			active: test
			active: prod

			@@ -18,10 +18,10 @@
			# 开发环境配置
			server:
			# 服务器的HTTP端口，默认为8080
			port: 8089
			port: 8088
			servlet:
			# 应用的访问路径
			context-path: /
			context-path: /applet
			tomcat:
			# tomcat的URI编码
			uri-encoding: UTF-8
			@@ -79,11 +79,11 @@
			# password: 123456
			host: 127.0.0.1
			# 端口，默认为6379
			port: 16379
			port: 10644
			# 数据库索引
			database: 1
			# 密码
			password: Chenkun@2025Redis!
			password: Haizhentong@2025Redis!
			# 连接超时时间
			timeout: 10s
			lettuce:
			@@ -105,7 +105,7 @@
			master:
			url: jdbc:mysql://127.0.0.1:10633/haizhentong?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
			username: root
			password: Chenkun@2025Mysql!
			password: Haizhentong@2025Mysql!
			# 从库数据源
			slave:
			# 从数据源开关/默认关闭
			@@ -227,10 +227,14 @@
			# 加签串
			apiKey: V7mKp9qL2Rs4jU6tX8wZ0bC3eF5hN1yD4gA
			# 加签证书地址
			privateKeyPath: D:/app/cert/weixin/apiclient_key.pem
			privateKeyPath: /usr/local/project/cert/weixin/apiclient_key.pem
			# 微信支付公钥id
			publicKeyId: PUB_KEY_ID_0117217579152025091800181718000000
			# 微信支付公钥证书
			publicKeyPath: /usr/local/project/cert/weixin/apiclient_cert.pem
			# 证书序列号
			mchSerialNo: 52C3F27D42CB31E70F93C2E9A3FF4F0BD845EA6B
			mchSerialNo: 39C7F6152E38A62B5786634D5C1F984FB5A38AD5
			# 支付成功回调地址
			notifyPayUrl: http://221.182.45.100/wx/pay/notify
			notifyPayUrl: https://haizhentong.com/applet/wx/pay/notify
			# 支付退款回调地址
			notifyRefundUrl: http://221.182.45.100/wx/refund/notify
			notifyRefundUrl: https://haizhentong.com/applet/wx/refund/notify