From 09214dd512a6c745ecfc771e5d895075b8c53d20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com> Date: Tue, 20 Aug 2024 15:42:33 +0800 Subject: [PATCH] 'commit' --- .../src/main/resources/bootstrap-pro-ylt.yml | 2 +- .../src/main/resources/bootstrap-pro.yml | 6 +- .../ZhuQue【废弃】 => ZhuQue}/.gitignore | 0 .../Doc/MongoDB使用办法.txt | 0 .../ZhuQue【废弃】 => ZhuQue}/Dockerfile | 0 .../Sql/黄海增加的表.sql | 0 .../ZhuQue【废弃】 => ZhuQue}/ZhuQue.iml | 0 {资料/ZhuQue【废弃】 => ZhuQue}/pom.xml | 2 +- .../ZhuQue/Handler/RepeatIntercetpor.java | 0 .../dsideal/ZhuQue/Handler/XssHandler.java | 0 .../Handler/XssHttpServletRequestWrapper.java | 0 .../Index/Controller/IndexController.java | 0 .../Interceptor/CheckIdsInterceptor.java | 0 .../ZhuQue/Interceptor/CheckIdsInterface.java | 0 .../ZhuQue/Interceptor/EmptyInterceptor.java | 0 .../ZhuQue/Interceptor/EmptyInterface.java | 0 .../ZhuQue/Interceptor/IsGuidInterceptor.java | 0 .../ZhuQue/Interceptor/IsGuidInterface.java | 0 .../Interceptor/IsLoginInterceptor.java | 0 .../ZhuQue/Interceptor/IsLoginInterface.java | 0 .../Interceptor/IsNumbericInterceptor.java | 0 .../Interceptor/IsNumericInterface.java | 0 .../Interceptor/IsSysAdminInterface.java | 0 .../ZhuQue/Interceptor/LengthInterceptor.java | 0 .../ZhuQue/Interceptor/LengthInterface.java | 0 .../dsideal/ZhuQue/Plugin/RedisCluster.java | 0 .../ZhuQue/Plugin/RedisClusterPlugin.java | 0 .../main/java/com/dsideal/ZhuQue/Start.java | 0 .../com/dsideal/ZhuQue/Test/TestKeTuo.java | 0 .../com/dsideal/ZhuQue/Test/TestMongoDb.java | 0 .../ZhuQue/Tools/GenerateMysqlDoc.java | 0 .../com/dsideal/ZhuQue/Util/CommonUtil.java | 0 .../com/dsideal/ZhuQue/Util/ConfigUtil.java | 0 .../com/dsideal/ZhuQue/Util/DateUtil.java | 0 .../com/dsideal/ZhuQue/Util/FileSizeUtil.java | 0 .../com/dsideal/ZhuQue/Util/IDCardUtil.java | 0 .../dsideal/ZhuQue/Util/IdCardGenerator.java | 0 .../java/com/dsideal/ZhuQue/Util/IpUtil.java | 0 .../com/dsideal/ZhuQue/Util/JSONUtil.java | 0 .../java/com/dsideal/ZhuQue/Util/JwtUtil.java | 0 .../com/dsideal/ZhuQue/Util/LogBackLog.java | 0 .../ZhuQue/Util/LogBackLogFactory.java | 0 .../com/dsideal/ZhuQue/Util/PassWordUtil.java | 0 .../java/com/dsideal/ZhuQue/Util/PkUtil.java | 0 .../ZhuQue/Util/RandomGeneratorUtil.java | 0 .../com/dsideal/ZhuQue/Util/RedisKit.java | 0 .../com/dsideal/ZhuQue/Util/ResultVO.java | 97 +++++++++++++++++++ .../com/dsideal/ZhuQue/Util/RsaUtils.java | 0 .../com/dsideal/ZhuQue/Util/SignUtils.java | 25 +++++ .../com/dsideal/ZhuQue/Util/SimilarUtil.java | 0 .../dsideal/ZhuQue/Util/SqlInjectionUtil.java | 0 .../dsideal/ZhuQue/Util/TelNumGenerator.java | 0 .../ZhuQue/Ylt/Controller/YltController.java | 76 +++++++++------ .../dsideal/ZhuQue/Ylt/Model/YltModel.java | 32 +++--- .../src/main/resource/Sql/test.sql | 0 .../src/main/resource/application.properties | 0 .../src/main/resource/fzby.txt | 0 .../src/main/resource/log4j.properties | 0 .../src/main/resource/logback.xml | 0 .../src/main/resource/undertow.properties | 2 +- .../生成依赖jar.bat | 0 61 files changed, 190 insertions(+), 52 deletions(-) rename {资料/ZhuQue【废弃】 => ZhuQue}/.gitignore (100%) rename {资料/ZhuQue【废弃】 => ZhuQue}/Doc/MongoDB使用办法.txt (100%) rename {资料/ZhuQue【废弃】 => ZhuQue}/Dockerfile (100%) rename {资料/ZhuQue【废弃】 => ZhuQue}/Sql/黄海增加的表.sql (100%) rename {资料/ZhuQue【废弃】 => ZhuQue}/ZhuQue.iml (100%) rename {资料/ZhuQue【废弃】 => ZhuQue}/pom.xml (96%) rename {资料/ZhuQue【废弃】 => ZhuQue}/src/main/java/com/dsideal/ZhuQue/Handler/RepeatIntercetpor.java (100%) rename {资料/ZhuQue【废弃】 => ZhuQue}/src/main/java/com/dsideal/ZhuQue/Handler/XssHandler.java (100%) rename {资料/ZhuQue【废弃】 => ZhuQue}/src/main/java/com/dsideal/ZhuQue/Handler/XssHttpServletRequestWrapper.java (100%) rename {资料/ZhuQue【废弃】 => ZhuQue}/src/main/java/com/dsideal/ZhuQue/Index/Controller/IndexController.java (100%) rename {资料/ZhuQue【废弃】 => ZhuQue}/src/main/java/com/dsideal/ZhuQue/Interceptor/CheckIdsInterceptor.java (100%) rename {资料/ZhuQue【废弃】 => ZhuQue}/src/main/java/com/dsideal/ZhuQue/Interceptor/CheckIdsInterface.java (100%) rename {资料/ZhuQue【废弃】 => ZhuQue}/src/main/java/com/dsideal/ZhuQue/Interceptor/EmptyInterceptor.java (100%) rename {资料/ZhuQue【废弃】 => ZhuQue}/src/main/java/com/dsideal/ZhuQue/Interceptor/EmptyInterface.java (100%) rename {资料/ZhuQue【废弃】 => ZhuQue}/src/main/java/com/dsideal/ZhuQue/Interceptor/IsGuidInterceptor.java (100%) rename {资料/ZhuQue【废弃】 => ZhuQue}/src/main/java/com/dsideal/ZhuQue/Interceptor/IsGuidInterface.java (100%) rename {资料/ZhuQue【废弃】 => ZhuQue}/src/main/java/com/dsideal/ZhuQue/Interceptor/IsLoginInterceptor.java (100%) rename {资料/ZhuQue【废弃】 => ZhuQue}/src/main/java/com/dsideal/ZhuQue/Interceptor/IsLoginInterface.java (100%) rename {资料/ZhuQue【废弃】 => ZhuQue}/src/main/java/com/dsideal/ZhuQue/Interceptor/IsNumbericInterceptor.java (100%) rename {资料/ZhuQue【废弃】 => ZhuQue}/src/main/java/com/dsideal/ZhuQue/Interceptor/IsNumericInterface.java (100%) rename {资料/ZhuQue【废弃】 => ZhuQue}/src/main/java/com/dsideal/ZhuQue/Interceptor/IsSysAdminInterface.java (100%) rename {资料/ZhuQue【废弃】 => ZhuQue}/src/main/java/com/dsideal/ZhuQue/Interceptor/LengthInterceptor.java (100%) rename {资料/ZhuQue【废弃】 => ZhuQue}/src/main/java/com/dsideal/ZhuQue/Interceptor/LengthInterface.java (100%) rename {资料/ZhuQue【废弃】 => ZhuQue}/src/main/java/com/dsideal/ZhuQue/Plugin/RedisCluster.java (100%) rename {资料/ZhuQue【废弃】 => ZhuQue}/src/main/java/com/dsideal/ZhuQue/Plugin/RedisClusterPlugin.java (100%) rename {资料/ZhuQue【废弃】 => ZhuQue}/src/main/java/com/dsideal/ZhuQue/Start.java (100%) rename {资料/ZhuQue【废弃】 => ZhuQue}/src/main/java/com/dsideal/ZhuQue/Test/TestKeTuo.java (100%) rename {资料/ZhuQue【废弃】 => ZhuQue}/src/main/java/com/dsideal/ZhuQue/Test/TestMongoDb.java (100%) rename {资料/ZhuQue【废弃】 => ZhuQue}/src/main/java/com/dsideal/ZhuQue/Tools/GenerateMysqlDoc.java (100%) rename {资料/ZhuQue【废弃】 => ZhuQue}/src/main/java/com/dsideal/ZhuQue/Util/CommonUtil.java (100%) rename {资料/ZhuQue【废弃】 => ZhuQue}/src/main/java/com/dsideal/ZhuQue/Util/ConfigUtil.java (100%) rename {资料/ZhuQue【废弃】 => ZhuQue}/src/main/java/com/dsideal/ZhuQue/Util/DateUtil.java (100%) rename {资料/ZhuQue【废弃】 => ZhuQue}/src/main/java/com/dsideal/ZhuQue/Util/FileSizeUtil.java (100%) rename {资料/ZhuQue【废弃】 => ZhuQue}/src/main/java/com/dsideal/ZhuQue/Util/IDCardUtil.java (100%) rename {资料/ZhuQue【废弃】 => ZhuQue}/src/main/java/com/dsideal/ZhuQue/Util/IdCardGenerator.java (100%) rename {资料/ZhuQue【废弃】 => ZhuQue}/src/main/java/com/dsideal/ZhuQue/Util/IpUtil.java (100%) rename {资料/ZhuQue【废弃】 => ZhuQue}/src/main/java/com/dsideal/ZhuQue/Util/JSONUtil.java (100%) rename {资料/ZhuQue【废弃】 => ZhuQue}/src/main/java/com/dsideal/ZhuQue/Util/JwtUtil.java (100%) rename {资料/ZhuQue【废弃】 => ZhuQue}/src/main/java/com/dsideal/ZhuQue/Util/LogBackLog.java (100%) rename {资料/ZhuQue【废弃】 => ZhuQue}/src/main/java/com/dsideal/ZhuQue/Util/LogBackLogFactory.java (100%) rename {资料/ZhuQue【废弃】 => ZhuQue}/src/main/java/com/dsideal/ZhuQue/Util/PassWordUtil.java (100%) rename {资料/ZhuQue【废弃】 => ZhuQue}/src/main/java/com/dsideal/ZhuQue/Util/PkUtil.java (100%) rename {资料/ZhuQue【废弃】 => ZhuQue}/src/main/java/com/dsideal/ZhuQue/Util/RandomGeneratorUtil.java (100%) rename {资料/ZhuQue【废弃】 => ZhuQue}/src/main/java/com/dsideal/ZhuQue/Util/RedisKit.java (100%) create mode 100644 ZhuQue/src/main/java/com/dsideal/ZhuQue/Util/ResultVO.java rename {资料/ZhuQue【废弃】 => ZhuQue}/src/main/java/com/dsideal/ZhuQue/Util/RsaUtils.java (100%) rename {资料/ZhuQue【废弃】 => ZhuQue}/src/main/java/com/dsideal/ZhuQue/Util/SignUtils.java (78%) rename {资料/ZhuQue【废弃】 => ZhuQue}/src/main/java/com/dsideal/ZhuQue/Util/SimilarUtil.java (100%) rename {资料/ZhuQue【废弃】 => ZhuQue}/src/main/java/com/dsideal/ZhuQue/Util/SqlInjectionUtil.java (100%) rename {资料/ZhuQue【废弃】 => ZhuQue}/src/main/java/com/dsideal/ZhuQue/Util/TelNumGenerator.java (100%) rename {资料/ZhuQue【废弃】 => ZhuQue}/src/main/java/com/dsideal/ZhuQue/Ylt/Controller/YltController.java (72%) rename {资料/ZhuQue【废弃】 => ZhuQue}/src/main/java/com/dsideal/ZhuQue/Ylt/Model/YltModel.java (76%) rename {资料/ZhuQue【废弃】 => ZhuQue}/src/main/resource/Sql/test.sql (100%) rename {资料/ZhuQue【废弃】 => ZhuQue}/src/main/resource/application.properties (100%) rename {资料/ZhuQue【废弃】 => ZhuQue}/src/main/resource/fzby.txt (100%) rename {资料/ZhuQue【废弃】 => ZhuQue}/src/main/resource/log4j.properties (100%) rename {资料/ZhuQue【废弃】 => ZhuQue}/src/main/resource/logback.xml (100%) rename {资料/ZhuQue【废弃】 => ZhuQue}/src/main/resource/undertow.properties (95%) rename {资料/ZhuQue【废弃】 => ZhuQue}/生成依赖jar.bat (100%) diff --git a/Ylt/ms-user/src/main/resources/bootstrap-pro-ylt.yml b/Ylt/ms-user/src/main/resources/bootstrap-pro-ylt.yml index 01e585d..3f4fda8 100644 --- a/Ylt/ms-user/src/main/resources/bootstrap-pro-ylt.yml +++ b/Ylt/ms-user/src/main/resources/bootstrap-pro-ylt.yml @@ -3,7 +3,7 @@ spring: mongodb: uri: mongodb://yltcharge:yltcharge@dds-bp176c45f561f0041.mongodb.rds.aliyuncs.com:3717,dds-bp176c45f561f0042.mongodb.rds.aliyuncs.com:3717/yltcharge?replicaSet=mgset-36440453 datasource: - url: jdbc:mysql://rm-bp1ux6tuk49er80t9.mysql.rds.aliyuncs.com:3306/yltcharge?useUnicode=true&characterEncoding=UTF-8&useSSL=false + url: jdbc:mysql://rm-bp1ux6tuk49er80t9.mysql.rds.aliyuncs.com:3306/yltcharge?useUnicode=true&characterEncoding=UTF-8 username: ylt password: Ycharge666 driver-class-name: com.mysql.jdbc.Driver diff --git a/Ylt/ms-user/src/main/resources/bootstrap-pro.yml b/Ylt/ms-user/src/main/resources/bootstrap-pro.yml index 4e21677..77faf22 100644 --- a/Ylt/ms-user/src/main/resources/bootstrap-pro.yml +++ b/Ylt/ms-user/src/main/resources/bootstrap-pro.yml @@ -3,7 +3,7 @@ spring: mongodb: uri: mongodb://ycharge:ycharge@dds-2vc0a87af9cfc5841.mongodb.cn-chengdu.rds.aliyuncs.com:3717,dds-2vc0a87af9cfc5842.mongodb.cn-chengdu.rds.aliyuncs.com:3717/ycharge datasource: - url: jdbc:mysql://rm-2vchv2m4c8dn72884.mysql.cn-chengdu.rds.aliyuncs.com:3306/ycharge?useUnicode=true&characterEncoding=UTF-8&useSSL=false + url: jdbc:mysql://rm-2vchv2m4c8dn72884.mysql.cn-chengdu.rds.aliyuncs.com:3306/ycharge?useUnicode=true&characterEncoding=UTF-8 username: ycharge password: Ycharge666 driver-class-name: com.mysql.jdbc.Driver @@ -74,8 +74,8 @@ aliyunvinapi: wx: config: - appId: wxf077d1a84a951991 - appScrect: f159a92730247f7e574bd8c538ae6910 + appId: wx9863e002c6a5f8bd + appScrect: ee9f5f214f2054f504544476ae542231 aliSms: product: Dysmsapi diff --git a/资料/ZhuQue【废弃】/.gitignore b/ZhuQue/.gitignore similarity index 100% rename from 资料/ZhuQue【废弃】/.gitignore rename to ZhuQue/.gitignore diff --git a/资料/ZhuQue【废弃】/Doc/MongoDB使用办法.txt b/ZhuQue/Doc/MongoDB使用办法.txt similarity index 100% rename from 资料/ZhuQue【废弃】/Doc/MongoDB使用办法.txt rename to ZhuQue/Doc/MongoDB使用办法.txt diff --git a/资料/ZhuQue【废弃】/Dockerfile b/ZhuQue/Dockerfile similarity index 100% rename from 资料/ZhuQue【废弃】/Dockerfile rename to ZhuQue/Dockerfile diff --git a/资料/ZhuQue【废弃】/Sql/黄海增加的表.sql b/ZhuQue/Sql/黄海增加的表.sql similarity index 100% rename from 资料/ZhuQue【废弃】/Sql/黄海增加的表.sql rename to ZhuQue/Sql/黄海增加的表.sql diff --git a/资料/ZhuQue【废弃】/ZhuQue.iml b/ZhuQue/ZhuQue.iml similarity index 100% rename from 资料/ZhuQue【废弃】/ZhuQue.iml rename to ZhuQue/ZhuQue.iml diff --git a/资料/ZhuQue【废弃】/pom.xml b/ZhuQue/pom.xml similarity index 96% rename from 资料/ZhuQue【废弃】/pom.xml rename to ZhuQue/pom.xml index 464c0fb..cdb4825 100644 --- a/资料/ZhuQue【废弃】/pom.xml +++ b/ZhuQue/pom.xml @@ -31,7 +31,7 @@ com.jfinal jfinal - 5.1.9 + 5.2.1 diff --git a/资料/ZhuQue【废弃】/src/main/java/com/dsideal/ZhuQue/Handler/RepeatIntercetpor.java b/ZhuQue/src/main/java/com/dsideal/ZhuQue/Handler/RepeatIntercetpor.java similarity index 100% rename from 资料/ZhuQue【废弃】/src/main/java/com/dsideal/ZhuQue/Handler/RepeatIntercetpor.java rename to ZhuQue/src/main/java/com/dsideal/ZhuQue/Handler/RepeatIntercetpor.java diff --git a/资料/ZhuQue【废弃】/src/main/java/com/dsideal/ZhuQue/Handler/XssHandler.java b/ZhuQue/src/main/java/com/dsideal/ZhuQue/Handler/XssHandler.java similarity index 100% rename from 资料/ZhuQue【废弃】/src/main/java/com/dsideal/ZhuQue/Handler/XssHandler.java rename to ZhuQue/src/main/java/com/dsideal/ZhuQue/Handler/XssHandler.java diff --git a/资料/ZhuQue【废弃】/src/main/java/com/dsideal/ZhuQue/Handler/XssHttpServletRequestWrapper.java b/ZhuQue/src/main/java/com/dsideal/ZhuQue/Handler/XssHttpServletRequestWrapper.java similarity index 100% rename from 资料/ZhuQue【废弃】/src/main/java/com/dsideal/ZhuQue/Handler/XssHttpServletRequestWrapper.java rename to ZhuQue/src/main/java/com/dsideal/ZhuQue/Handler/XssHttpServletRequestWrapper.java diff --git a/资料/ZhuQue【废弃】/src/main/java/com/dsideal/ZhuQue/Index/Controller/IndexController.java b/ZhuQue/src/main/java/com/dsideal/ZhuQue/Index/Controller/IndexController.java similarity index 100% rename from 资料/ZhuQue【废弃】/src/main/java/com/dsideal/ZhuQue/Index/Controller/IndexController.java rename to ZhuQue/src/main/java/com/dsideal/ZhuQue/Index/Controller/IndexController.java diff --git a/资料/ZhuQue【废弃】/src/main/java/com/dsideal/ZhuQue/Interceptor/CheckIdsInterceptor.java b/ZhuQue/src/main/java/com/dsideal/ZhuQue/Interceptor/CheckIdsInterceptor.java similarity index 100% rename from 资料/ZhuQue【废弃】/src/main/java/com/dsideal/ZhuQue/Interceptor/CheckIdsInterceptor.java rename to ZhuQue/src/main/java/com/dsideal/ZhuQue/Interceptor/CheckIdsInterceptor.java diff --git a/资料/ZhuQue【废弃】/src/main/java/com/dsideal/ZhuQue/Interceptor/CheckIdsInterface.java b/ZhuQue/src/main/java/com/dsideal/ZhuQue/Interceptor/CheckIdsInterface.java similarity index 100% rename from 资料/ZhuQue【废弃】/src/main/java/com/dsideal/ZhuQue/Interceptor/CheckIdsInterface.java rename to ZhuQue/src/main/java/com/dsideal/ZhuQue/Interceptor/CheckIdsInterface.java diff --git a/资料/ZhuQue【废弃】/src/main/java/com/dsideal/ZhuQue/Interceptor/EmptyInterceptor.java b/ZhuQue/src/main/java/com/dsideal/ZhuQue/Interceptor/EmptyInterceptor.java similarity index 100% rename from 资料/ZhuQue【废弃】/src/main/java/com/dsideal/ZhuQue/Interceptor/EmptyInterceptor.java rename to ZhuQue/src/main/java/com/dsideal/ZhuQue/Interceptor/EmptyInterceptor.java diff --git a/资料/ZhuQue【废弃】/src/main/java/com/dsideal/ZhuQue/Interceptor/EmptyInterface.java b/ZhuQue/src/main/java/com/dsideal/ZhuQue/Interceptor/EmptyInterface.java similarity index 100% rename from 资料/ZhuQue【废弃】/src/main/java/com/dsideal/ZhuQue/Interceptor/EmptyInterface.java rename to ZhuQue/src/main/java/com/dsideal/ZhuQue/Interceptor/EmptyInterface.java diff --git a/资料/ZhuQue【废弃】/src/main/java/com/dsideal/ZhuQue/Interceptor/IsGuidInterceptor.java b/ZhuQue/src/main/java/com/dsideal/ZhuQue/Interceptor/IsGuidInterceptor.java similarity index 100% rename from 资料/ZhuQue【废弃】/src/main/java/com/dsideal/ZhuQue/Interceptor/IsGuidInterceptor.java rename to ZhuQue/src/main/java/com/dsideal/ZhuQue/Interceptor/IsGuidInterceptor.java diff --git a/资料/ZhuQue【废弃】/src/main/java/com/dsideal/ZhuQue/Interceptor/IsGuidInterface.java b/ZhuQue/src/main/java/com/dsideal/ZhuQue/Interceptor/IsGuidInterface.java similarity index 100% rename from 资料/ZhuQue【废弃】/src/main/java/com/dsideal/ZhuQue/Interceptor/IsGuidInterface.java rename to ZhuQue/src/main/java/com/dsideal/ZhuQue/Interceptor/IsGuidInterface.java diff --git a/资料/ZhuQue【废弃】/src/main/java/com/dsideal/ZhuQue/Interceptor/IsLoginInterceptor.java b/ZhuQue/src/main/java/com/dsideal/ZhuQue/Interceptor/IsLoginInterceptor.java similarity index 100% rename from 资料/ZhuQue【废弃】/src/main/java/com/dsideal/ZhuQue/Interceptor/IsLoginInterceptor.java rename to ZhuQue/src/main/java/com/dsideal/ZhuQue/Interceptor/IsLoginInterceptor.java diff --git a/资料/ZhuQue【废弃】/src/main/java/com/dsideal/ZhuQue/Interceptor/IsLoginInterface.java b/ZhuQue/src/main/java/com/dsideal/ZhuQue/Interceptor/IsLoginInterface.java similarity index 100% rename from 资料/ZhuQue【废弃】/src/main/java/com/dsideal/ZhuQue/Interceptor/IsLoginInterface.java rename to ZhuQue/src/main/java/com/dsideal/ZhuQue/Interceptor/IsLoginInterface.java diff --git a/资料/ZhuQue【废弃】/src/main/java/com/dsideal/ZhuQue/Interceptor/IsNumbericInterceptor.java b/ZhuQue/src/main/java/com/dsideal/ZhuQue/Interceptor/IsNumbericInterceptor.java similarity index 100% rename from 资料/ZhuQue【废弃】/src/main/java/com/dsideal/ZhuQue/Interceptor/IsNumbericInterceptor.java rename to ZhuQue/src/main/java/com/dsideal/ZhuQue/Interceptor/IsNumbericInterceptor.java diff --git a/资料/ZhuQue【废弃】/src/main/java/com/dsideal/ZhuQue/Interceptor/IsNumericInterface.java b/ZhuQue/src/main/java/com/dsideal/ZhuQue/Interceptor/IsNumericInterface.java similarity index 100% rename from 资料/ZhuQue【废弃】/src/main/java/com/dsideal/ZhuQue/Interceptor/IsNumericInterface.java rename to ZhuQue/src/main/java/com/dsideal/ZhuQue/Interceptor/IsNumericInterface.java diff --git a/资料/ZhuQue【废弃】/src/main/java/com/dsideal/ZhuQue/Interceptor/IsSysAdminInterface.java b/ZhuQue/src/main/java/com/dsideal/ZhuQue/Interceptor/IsSysAdminInterface.java similarity index 100% rename from 资料/ZhuQue【废弃】/src/main/java/com/dsideal/ZhuQue/Interceptor/IsSysAdminInterface.java rename to ZhuQue/src/main/java/com/dsideal/ZhuQue/Interceptor/IsSysAdminInterface.java diff --git a/资料/ZhuQue【废弃】/src/main/java/com/dsideal/ZhuQue/Interceptor/LengthInterceptor.java b/ZhuQue/src/main/java/com/dsideal/ZhuQue/Interceptor/LengthInterceptor.java similarity index 100% rename from 资料/ZhuQue【废弃】/src/main/java/com/dsideal/ZhuQue/Interceptor/LengthInterceptor.java rename to ZhuQue/src/main/java/com/dsideal/ZhuQue/Interceptor/LengthInterceptor.java diff --git a/资料/ZhuQue【废弃】/src/main/java/com/dsideal/ZhuQue/Interceptor/LengthInterface.java b/ZhuQue/src/main/java/com/dsideal/ZhuQue/Interceptor/LengthInterface.java similarity index 100% rename from 资料/ZhuQue【废弃】/src/main/java/com/dsideal/ZhuQue/Interceptor/LengthInterface.java rename to ZhuQue/src/main/java/com/dsideal/ZhuQue/Interceptor/LengthInterface.java diff --git a/资料/ZhuQue【废弃】/src/main/java/com/dsideal/ZhuQue/Plugin/RedisCluster.java b/ZhuQue/src/main/java/com/dsideal/ZhuQue/Plugin/RedisCluster.java similarity index 100% rename from 资料/ZhuQue【废弃】/src/main/java/com/dsideal/ZhuQue/Plugin/RedisCluster.java rename to ZhuQue/src/main/java/com/dsideal/ZhuQue/Plugin/RedisCluster.java diff --git a/资料/ZhuQue【废弃】/src/main/java/com/dsideal/ZhuQue/Plugin/RedisClusterPlugin.java b/ZhuQue/src/main/java/com/dsideal/ZhuQue/Plugin/RedisClusterPlugin.java similarity index 100% rename from 资料/ZhuQue【废弃】/src/main/java/com/dsideal/ZhuQue/Plugin/RedisClusterPlugin.java rename to ZhuQue/src/main/java/com/dsideal/ZhuQue/Plugin/RedisClusterPlugin.java diff --git a/资料/ZhuQue【废弃】/src/main/java/com/dsideal/ZhuQue/Start.java b/ZhuQue/src/main/java/com/dsideal/ZhuQue/Start.java similarity index 100% rename from 资料/ZhuQue【废弃】/src/main/java/com/dsideal/ZhuQue/Start.java rename to ZhuQue/src/main/java/com/dsideal/ZhuQue/Start.java diff --git a/资料/ZhuQue【废弃】/src/main/java/com/dsideal/ZhuQue/Test/TestKeTuo.java b/ZhuQue/src/main/java/com/dsideal/ZhuQue/Test/TestKeTuo.java similarity index 100% rename from 资料/ZhuQue【废弃】/src/main/java/com/dsideal/ZhuQue/Test/TestKeTuo.java rename to ZhuQue/src/main/java/com/dsideal/ZhuQue/Test/TestKeTuo.java diff --git a/资料/ZhuQue【废弃】/src/main/java/com/dsideal/ZhuQue/Test/TestMongoDb.java b/ZhuQue/src/main/java/com/dsideal/ZhuQue/Test/TestMongoDb.java similarity index 100% rename from 资料/ZhuQue【废弃】/src/main/java/com/dsideal/ZhuQue/Test/TestMongoDb.java rename to ZhuQue/src/main/java/com/dsideal/ZhuQue/Test/TestMongoDb.java diff --git a/资料/ZhuQue【废弃】/src/main/java/com/dsideal/ZhuQue/Tools/GenerateMysqlDoc.java b/ZhuQue/src/main/java/com/dsideal/ZhuQue/Tools/GenerateMysqlDoc.java similarity index 100% rename from 资料/ZhuQue【废弃】/src/main/java/com/dsideal/ZhuQue/Tools/GenerateMysqlDoc.java rename to ZhuQue/src/main/java/com/dsideal/ZhuQue/Tools/GenerateMysqlDoc.java diff --git a/资料/ZhuQue【废弃】/src/main/java/com/dsideal/ZhuQue/Util/CommonUtil.java b/ZhuQue/src/main/java/com/dsideal/ZhuQue/Util/CommonUtil.java similarity index 100% rename from 资料/ZhuQue【废弃】/src/main/java/com/dsideal/ZhuQue/Util/CommonUtil.java rename to ZhuQue/src/main/java/com/dsideal/ZhuQue/Util/CommonUtil.java diff --git a/资料/ZhuQue【废弃】/src/main/java/com/dsideal/ZhuQue/Util/ConfigUtil.java b/ZhuQue/src/main/java/com/dsideal/ZhuQue/Util/ConfigUtil.java similarity index 100% rename from 资料/ZhuQue【废弃】/src/main/java/com/dsideal/ZhuQue/Util/ConfigUtil.java rename to ZhuQue/src/main/java/com/dsideal/ZhuQue/Util/ConfigUtil.java diff --git a/资料/ZhuQue【废弃】/src/main/java/com/dsideal/ZhuQue/Util/DateUtil.java b/ZhuQue/src/main/java/com/dsideal/ZhuQue/Util/DateUtil.java similarity index 100% rename from 资料/ZhuQue【废弃】/src/main/java/com/dsideal/ZhuQue/Util/DateUtil.java rename to ZhuQue/src/main/java/com/dsideal/ZhuQue/Util/DateUtil.java diff --git a/资料/ZhuQue【废弃】/src/main/java/com/dsideal/ZhuQue/Util/FileSizeUtil.java b/ZhuQue/src/main/java/com/dsideal/ZhuQue/Util/FileSizeUtil.java similarity index 100% rename from 资料/ZhuQue【废弃】/src/main/java/com/dsideal/ZhuQue/Util/FileSizeUtil.java rename to ZhuQue/src/main/java/com/dsideal/ZhuQue/Util/FileSizeUtil.java diff --git a/资料/ZhuQue【废弃】/src/main/java/com/dsideal/ZhuQue/Util/IDCardUtil.java b/ZhuQue/src/main/java/com/dsideal/ZhuQue/Util/IDCardUtil.java similarity index 100% rename from 资料/ZhuQue【废弃】/src/main/java/com/dsideal/ZhuQue/Util/IDCardUtil.java rename to ZhuQue/src/main/java/com/dsideal/ZhuQue/Util/IDCardUtil.java diff --git a/资料/ZhuQue【废弃】/src/main/java/com/dsideal/ZhuQue/Util/IdCardGenerator.java b/ZhuQue/src/main/java/com/dsideal/ZhuQue/Util/IdCardGenerator.java similarity index 100% rename from 资料/ZhuQue【废弃】/src/main/java/com/dsideal/ZhuQue/Util/IdCardGenerator.java rename to ZhuQue/src/main/java/com/dsideal/ZhuQue/Util/IdCardGenerator.java diff --git a/资料/ZhuQue【废弃】/src/main/java/com/dsideal/ZhuQue/Util/IpUtil.java b/ZhuQue/src/main/java/com/dsideal/ZhuQue/Util/IpUtil.java similarity index 100% rename from 资料/ZhuQue【废弃】/src/main/java/com/dsideal/ZhuQue/Util/IpUtil.java rename to ZhuQue/src/main/java/com/dsideal/ZhuQue/Util/IpUtil.java diff --git a/资料/ZhuQue【废弃】/src/main/java/com/dsideal/ZhuQue/Util/JSONUtil.java b/ZhuQue/src/main/java/com/dsideal/ZhuQue/Util/JSONUtil.java similarity index 100% rename from 资料/ZhuQue【废弃】/src/main/java/com/dsideal/ZhuQue/Util/JSONUtil.java rename to ZhuQue/src/main/java/com/dsideal/ZhuQue/Util/JSONUtil.java diff --git a/资料/ZhuQue【废弃】/src/main/java/com/dsideal/ZhuQue/Util/JwtUtil.java b/ZhuQue/src/main/java/com/dsideal/ZhuQue/Util/JwtUtil.java similarity index 100% rename from 资料/ZhuQue【废弃】/src/main/java/com/dsideal/ZhuQue/Util/JwtUtil.java rename to ZhuQue/src/main/java/com/dsideal/ZhuQue/Util/JwtUtil.java diff --git a/资料/ZhuQue【废弃】/src/main/java/com/dsideal/ZhuQue/Util/LogBackLog.java b/ZhuQue/src/main/java/com/dsideal/ZhuQue/Util/LogBackLog.java similarity index 100% rename from 资料/ZhuQue【废弃】/src/main/java/com/dsideal/ZhuQue/Util/LogBackLog.java rename to ZhuQue/src/main/java/com/dsideal/ZhuQue/Util/LogBackLog.java diff --git a/资料/ZhuQue【废弃】/src/main/java/com/dsideal/ZhuQue/Util/LogBackLogFactory.java b/ZhuQue/src/main/java/com/dsideal/ZhuQue/Util/LogBackLogFactory.java similarity index 100% rename from 资料/ZhuQue【废弃】/src/main/java/com/dsideal/ZhuQue/Util/LogBackLogFactory.java rename to ZhuQue/src/main/java/com/dsideal/ZhuQue/Util/LogBackLogFactory.java diff --git a/资料/ZhuQue【废弃】/src/main/java/com/dsideal/ZhuQue/Util/PassWordUtil.java b/ZhuQue/src/main/java/com/dsideal/ZhuQue/Util/PassWordUtil.java similarity index 100% rename from 资料/ZhuQue【废弃】/src/main/java/com/dsideal/ZhuQue/Util/PassWordUtil.java rename to ZhuQue/src/main/java/com/dsideal/ZhuQue/Util/PassWordUtil.java diff --git a/资料/ZhuQue【废弃】/src/main/java/com/dsideal/ZhuQue/Util/PkUtil.java b/ZhuQue/src/main/java/com/dsideal/ZhuQue/Util/PkUtil.java similarity index 100% rename from 资料/ZhuQue【废弃】/src/main/java/com/dsideal/ZhuQue/Util/PkUtil.java rename to ZhuQue/src/main/java/com/dsideal/ZhuQue/Util/PkUtil.java diff --git a/资料/ZhuQue【废弃】/src/main/java/com/dsideal/ZhuQue/Util/RandomGeneratorUtil.java b/ZhuQue/src/main/java/com/dsideal/ZhuQue/Util/RandomGeneratorUtil.java similarity index 100% rename from 资料/ZhuQue【废弃】/src/main/java/com/dsideal/ZhuQue/Util/RandomGeneratorUtil.java rename to ZhuQue/src/main/java/com/dsideal/ZhuQue/Util/RandomGeneratorUtil.java diff --git a/资料/ZhuQue【废弃】/src/main/java/com/dsideal/ZhuQue/Util/RedisKit.java b/ZhuQue/src/main/java/com/dsideal/ZhuQue/Util/RedisKit.java similarity index 100% rename from 资料/ZhuQue【废弃】/src/main/java/com/dsideal/ZhuQue/Util/RedisKit.java rename to ZhuQue/src/main/java/com/dsideal/ZhuQue/Util/RedisKit.java diff --git a/ZhuQue/src/main/java/com/dsideal/ZhuQue/Util/ResultVO.java b/ZhuQue/src/main/java/com/dsideal/ZhuQue/Util/ResultVO.java new file mode 100644 index 0000000..b038849 --- /dev/null +++ b/ZhuQue/src/main/java/com/dsideal/ZhuQue/Util/ResultVO.java @@ -0,0 +1,97 @@ +package com.dsideal.ZhuQue.Util; + +public class ResultVO { + private Integer code; //返回码 + private String msg; //返回提示信息 + private Object data; //返回数据 + private boolean success;//是否成功 + /** + * 成功请求 + * @param data + * @return + */ + public static ResultVO success(Object data){ + ResultVO res = new ResultVO(); + res.setCode(1000); + res.setSuccess(true); + res.setMsg("请求成功"); + res.setData(data); + return res; + } + + /** + * 成功请求 + * @param + * @return + */ + public static ResultVO success(){ + ResultVO res = new ResultVO(); + res.setCode(1000); + res.setSuccess(true); + res.setMsg("请求成功"); + res.setData(null); + return res; + } + + /** + * 返回自定义数据 + * @param msg + * @param errorCode + * @return + */ + public static ResultVO custom(String msg, int errorCode){ + ResultVO res = new ResultVO(); + res.setCode(errorCode); + res.setSuccess(false); + res.setMsg(msg); + res.setData(null); + return res; + } + + /** + * 返回自定义数据 + * @param msg + * @param errorCode + * @param data + * @return + */ + public static ResultVO custom(String msg, int errorCode, Object data){ + ResultVO res = new ResultVO(); + res.setCode(errorCode); + res.setMsg(msg); + res.setData(data); + return res; + } + + public Integer getCode() { + return code; + } + + public void setCode(Integer code) { + this.code = code; + } + + public String getMsg() { + return msg; + } + + public void setMsg(String msg) { + this.msg = msg; + } + + public Object getData() { + return data; + } + + public void setData(Object data) { + this.data = data; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } +} diff --git a/资料/ZhuQue【废弃】/src/main/java/com/dsideal/ZhuQue/Util/RsaUtils.java b/ZhuQue/src/main/java/com/dsideal/ZhuQue/Util/RsaUtils.java similarity index 100% rename from 资料/ZhuQue【废弃】/src/main/java/com/dsideal/ZhuQue/Util/RsaUtils.java rename to ZhuQue/src/main/java/com/dsideal/ZhuQue/Util/RsaUtils.java diff --git a/资料/ZhuQue【废弃】/src/main/java/com/dsideal/ZhuQue/Util/SignUtils.java b/ZhuQue/src/main/java/com/dsideal/ZhuQue/Util/SignUtils.java similarity index 78% rename from 资料/ZhuQue【废弃】/src/main/java/com/dsideal/ZhuQue/Util/SignUtils.java rename to ZhuQue/src/main/java/com/dsideal/ZhuQue/Util/SignUtils.java index 94b8e46..854db2f 100644 --- a/资料/ZhuQue【废弃】/src/main/java/com/dsideal/ZhuQue/Util/SignUtils.java +++ b/ZhuQue/src/main/java/com/dsideal/ZhuQue/Util/SignUtils.java @@ -2,6 +2,7 @@ package com.dsideal.ZhuQue.Util; import com.alibaba.fastjson.JSONObject; import com.google.common.base.Joiner; + import java.nio.charset.StandardCharsets; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; @@ -45,6 +46,30 @@ public class SignUtils { return md5(temp).toUpperCase(); } + /** + * 功能：安快的闸机签名 + * + * @param requestBody + * @param appSecret + * @return + */ + public static String paramsAnKuaiSign(JSONObject requestBody, String appSecret) { + TreeMap params = new TreeMap<>(); + requestBody.entrySet().stream().filter( + p -> p.getValue() != null + && !(p.getValue() instanceof Map) + && !(p.getValue() instanceof Iterable)) + .forEach(p -> { + if (!p.getValue().equals("")) { + params.put(p.getKey(), p.getValue().toString()); + } + }); + //拼接appSecret + String temp = Joiner.on("&").withKeyValueSeparator("=").join(params).concat("&secret=").concat(appSecret); + String res = md5(temp); + return res; + } + /** * 对文本执行 md5 摘要加密, 此算法与 mysql,JavaScript生成的md5摘要进行过一致性对比. * diff --git a/资料/ZhuQue【废弃】/src/main/java/com/dsideal/ZhuQue/Util/SimilarUtil.java b/ZhuQue/src/main/java/com/dsideal/ZhuQue/Util/SimilarUtil.java similarity index 100% rename from 资料/ZhuQue【废弃】/src/main/java/com/dsideal/ZhuQue/Util/SimilarUtil.java rename to ZhuQue/src/main/java/com/dsideal/ZhuQue/Util/SimilarUtil.java diff --git a/资料/ZhuQue【废弃】/src/main/java/com/dsideal/ZhuQue/Util/SqlInjectionUtil.java b/ZhuQue/src/main/java/com/dsideal/ZhuQue/Util/SqlInjectionUtil.java similarity index 100% rename from 资料/ZhuQue【废弃】/src/main/java/com/dsideal/ZhuQue/Util/SqlInjectionUtil.java rename to ZhuQue/src/main/java/com/dsideal/ZhuQue/Util/SqlInjectionUtil.java diff --git a/资料/ZhuQue【废弃】/src/main/java/com/dsideal/ZhuQue/Util/TelNumGenerator.java b/ZhuQue/src/main/java/com/dsideal/ZhuQue/Util/TelNumGenerator.java similarity index 100% rename from 资料/ZhuQue【废弃】/src/main/java/com/dsideal/ZhuQue/Util/TelNumGenerator.java rename to ZhuQue/src/main/java/com/dsideal/ZhuQue/Util/TelNumGenerator.java diff --git a/资料/ZhuQue【废弃】/src/main/java/com/dsideal/ZhuQue/Ylt/Controller/YltController.java b/ZhuQue/src/main/java/com/dsideal/ZhuQue/Ylt/Controller/YltController.java similarity index 72% rename from 资料/ZhuQue【废弃】/src/main/java/com/dsideal/ZhuQue/Ylt/Controller/YltController.java rename to ZhuQue/src/main/java/com/dsideal/ZhuQue/Ylt/Controller/YltController.java index 3c2cd4f..2ea2cba 100644 --- a/资料/ZhuQue【废弃】/src/main/java/com/dsideal/ZhuQue/Ylt/Controller/YltController.java +++ b/ZhuQue/src/main/java/com/dsideal/ZhuQue/Ylt/Controller/YltController.java @@ -6,6 +6,7 @@ import com.cybermkd.mongo.kit.MongoQuery; import com.dsideal.ZhuQue.Interceptor.EmptyInterface; import com.dsideal.ZhuQue.Interceptor.IsLoginInterface; import com.dsideal.ZhuQue.Util.CommonUtil; +import com.dsideal.ZhuQue.Util.ResultVO; import com.dsideal.ZhuQue.Util.SignUtils; import com.dsideal.ZhuQue.Ylt.Model.YltModel; import com.jfinal.aop.Before; @@ -23,7 +24,6 @@ import java.util.UUID; public class YltController extends Controller { Logger log = LoggerFactory.getLogger(YltController.class); YltModel ym = new YltModel(); - MongoQuery query = new MongoQuery(); /** * 功能：获取当前订单是不是在有合作的道闸车场内，这样的车场停车有减免 @@ -31,14 +31,14 @@ public class YltController extends Controller { * @param order_no */ @Before({POST.class}) - @IsLoginInterface({}) - public void isThirdPartyStation(String order_no) { + //@IsLoginInterface({}) + // @PostMapping("/station/isThirdPartyStation") + public ResultVO isThirdPartyStation(String order_no) { Record record = ym.getThirdPartyStation(order_no); if (record == null) { - renderJson(CommonUtil.getRet(false, "不在合作的道闸车场内！")); - return; + return ResultVO.custom("不在合作的道闸车场内", -1); } - renderJson(CommonUtil.getRet(true, "在合作的道闸车场内！")); + return ResultVO.success("在合作的道闸车场内"); } /** @@ -46,32 +46,29 @@ public class YltController extends Controller { */ @Before({GET.class}) @IsLoginInterface({}) - public void getCarList() { + // @PostMapping("/station/getCarList") + public ResultVO getCarList() { //获取当前登录人员信息 - Record user = ym.getUser(getRequest()); - int userId = Integer.parseInt(user.get("userId")); + int userId = Integer.parseInt(getRequest().getHeader("userId")); List list = ym.getCarList(userId); - renderJson(CommonUtil.getRet(list, true, "获取成功！")); + return ResultVO.success(list); } + /** * 功能: 向第三方道闸同步充电桩支付信息 */ @Before({POST.class}) @IsLoginInterface({}) @EmptyInterface({"order_no", "charge_plate_no"}) - // 非指定闸机场地 - // http://10.10.21.20:8888/ZhuQue/Ylt/SyncChargePilePay?order_no=2020092315154430479&charge_plate_no=吉A88888 - // 科拓闸机场地 - // http://10.10.21.20:8888/ZhuQue/Ylt/SyncChargePilePay?order_no=2022012911045715187&charge_plate_no=吉A88888 - // 智门科技 - // http://10.10.21.20:8888/ZhuQue/Ylt/SyncChargePilePay?order_no=2021040710440684484&charge_plate_no=吉A88888 - public void SyncChargePilePay(String order_no, String charge_plate_no) { //订单号，车牌号 + public ResultVO SyncChargePilePay(String order_no, String charge_plate_no) { + //模拟一下假的订单 + order_no="2023010415453464446"; + //根据订单号获取到第三方方面提供的车场信息 Record thirdPartyStation = ym.getThirdPartyStation(order_no); if (thirdPartyStation == null) { - renderJson(CommonUtil.getRet(false, "检查到不是需要免费的道闸所在车场，无需发送减免消息！！")); - return; + return ResultVO.custom("检查到不是需要免费的道闸所在车场，无需发送减免消息！！", -1); } //请求地址 String url = thirdPartyStation.getStr("third_party_url"); @@ -82,7 +79,7 @@ public class YltController extends Controller { //闸机提供商 String name = thirdPartyStation.getStr("third_party_name"); //闸机所在车场ID - int parkId = thirdPartyStation.getInt("third_party_station_id"); + String parkId = thirdPartyStation.getStr("third_party_station_id"); //最小充电费用 int mini_receivable_total_fee = thirdPartyStation.getInt("mini_receivable_total_fee"); //最小充电度数 @@ -91,12 +88,11 @@ public class YltController extends Controller { int freeMoney = thirdPartyStation.getInt("freeMoney");//免费0元 // 减免时长 int freeTime = thirdPartyStation.getInt("freeTime");//2小时 - log.info("发现闸机提供商：" + name + ",parkId=" + parkId); + //log.info("发现闸机提供商：" + name + ",parkId=" + parkId); //订单信息 Record ddRecord = ym.getOrderByNo(order_no); - String charge_begin_time = ddRecord.getStr("charge_begin_time");//充电开始时间 - String charge_end_time = ddRecord.getStr("charge_end_time");//充电结束时间 + int stationId = ddRecord.getInt("station_id");//电站ID //获取车场名称 String stationName = ym.getStationById(stationId).getStr("station_name"); @@ -117,15 +113,17 @@ public class YltController extends Controller { //本地车场配置减免规则，根据充电时长换算 int freeType = 1; + JSONObject jo = new JSONObject(); //必须保证满足最低收费规则 if (totalMoney >= mini_receivable_total_fee && power >= mini_charge_ah) { // 科拓闸机 if ("科拓".equals(name)) { - JSONObject jo = new JSONObject(); jo.put("appId", appId); jo.put("parkId", parkId); jo.put("serviceCode", "syncChargePilePay"); // 获取当前时间戳 + String charge_begin_time = ddRecord.getStr("charge_begin_time");//充电开始时间 + String charge_end_time = ddRecord.getStr("charge_end_time");//充电结束时间 long timestamp = System.currentTimeMillis(); jo.put("ts", timestamp);//每次请求附带当前时间戳(格林威治时间1970年01月01日00时00分00秒起至现在的总毫秒数)超过10S请求失效 jo.put("reqId", UUID.randomUUID().toString().toUpperCase());//每次请求的唯一标识，如果是异步接口，异步响应消息的reqId会与原请求的reqId一致。每次请求必须唯一！！！ @@ -154,10 +152,8 @@ public class YltController extends Controller { .execute().body(); // 发送请求并获取响应体 //记录到数据库中闸机的流水记录 ym.recordDzLog(order_no, charge_plate_no, jo.toString(), result); - renderJson(CommonUtil.getRet(JSONObject.parseObject(result), true, "已经向科拓闸机平台发送了减免消息！")); - return; + return ResultVO.success(JSONObject.parseObject(result)); } else if ("智门科技".equals(name)) { - JSONObject jo = new JSONObject(); jo.put("Ver", 2);//协议版本 jo.put("Uid", UUID.randomUUID().toString().toUpperCase());//请求编号（协议唯一码，可使用uuid） jo.put("Timestamp", System.currentTimeMillis());//时间戳（1970-01-01到现在的秒数） @@ -170,7 +166,7 @@ public class YltController extends Controller { dataJo.put("License", charge_plate_no);//车牌 dataJo.put("DiscountType", 2);//优惠类型为时长 dataJo.put("DiscountFee", 0);//优惠金额0分 - dataJo.put("DiscountMinute", 60 * 2);//优惠分钟 + dataJo.put("DiscountMinute", freeTime);//优惠分钟 jo.put("Data", dataJo);//请求数据 json String result = HttpUtil.createPost(url) .body(jo.toString()) // 将 JSON 对象转换为字符串作为请求正文 @@ -178,10 +174,28 @@ public class YltController extends Controller { .execute().body(); // 发送请求并获取响应体 //记录到数据库中闸机的流水记录 ym.recordDzLog(order_no, charge_plate_no, jo.toString(), result); - renderJson(CommonUtil.getRet(JSONObject.parseObject(result), true, "已经向智门科技闸机平台发送了减免消息！")); - return; + return ResultVO.success(JSONObject.parseObject(result)); + } else if ("安快I".equals(name)) { + jo.put("parkNo", parkId); + jo.put("plate", charge_plate_no);//车牌号 + jo.put("plate_color", 5);//车牌颜色,绿色 + jo.put("coupon_type", 1);//1固定时长券 + jo.put("couponName", "充电减免"); + jo.put("coupon_value", freeTime);//卷面值 分钟 | 分 + jo.put("appid", appId);//应用编号 + jo.put("ts", System.currentTimeMillis() / 1000);//时间戳 + jo.put("sign", SignUtils.paramsAnKuaiSign(jo, appSecret));//签名 + // 发送 POST 请求并获取响应 + String result = HttpUtil.createPost(url) + .body(jo.toString()) // 将 JSON 对象转换为字符串作为请求正文 + .header("version", "1.0.0") + .header("Content-Type", "application/json") // 设置请求头，指明内容类型为 JSON + .execute().body(); // 发送请求并获取响应体 + //记录到数据库中闸机的流水记录 + ym.recordDzLog(order_no, charge_plate_no, jo.toString(), result); + return ResultVO.success(JSONObject.parseObject(result)); } } - renderJson(CommonUtil.getRet(false, "发现了一个未知的闸机厂商，请联系开发人员！")); + return null; } } \ No newline at end of file diff --git a/资料/ZhuQue【废弃】/src/main/java/com/dsideal/ZhuQue/Ylt/Model/YltModel.java b/ZhuQue/src/main/java/com/dsideal/ZhuQue/Ylt/Model/YltModel.java similarity index 76% rename from 资料/ZhuQue【废弃】/src/main/java/com/dsideal/ZhuQue/Ylt/Model/YltModel.java rename to ZhuQue/src/main/java/com/dsideal/ZhuQue/Ylt/Model/YltModel.java index d20fda0..7d24be6 100644 --- a/资料/ZhuQue【废弃】/src/main/java/com/dsideal/ZhuQue/Ylt/Model/YltModel.java +++ b/ZhuQue/src/main/java/com/dsideal/ZhuQue/Ylt/Model/YltModel.java @@ -11,26 +11,21 @@ import com.jfinal.plugin.activerecord.Record; import java.util.List; public class YltModel { + /** - * 功能：根据JWT的token获取当前用户信息 + * 功能：查询指定订单号订单轨迹 * - * @param request + * @param orderNo * @return */ - public Record getUser(HttpServletRequest request) { - //从Http请求头中获取Authorization - String Authorization = request.getHeader("Authorization"); - String secret = JwtUtil.SECRET; - String token = Authorization.replaceFirst(JwtUtil.AUTHORIZATION_STARTER, ""); - Claims cs = JwtUtil.getClaimsFromToken(token, secret); - String userId = cs.get("userId", String.class); - String phone = cs.get("phone", String.class); - Record record = new Record(); - record.set("userId", userId); - record.set("phone", phone); + public Record getLastUnReportOrderByOrderNoTrack(String orderNo) { + //通过订单号查询订单轨迹 + String sql = "select * from t_equipment_charge_order_track where order_no=? order by id desc limit 1;"; + Record record = Db.findFirst(sql, orderNo); return record; } + /** * 功能：传入一个订单ID，判断它所在的车场是不是第三方道闸的车场 * @@ -38,7 +33,13 @@ public class YltModel { * @return */ public Record getThirdPartyStation(String order_no) { - Record record = getOrderByNo(order_no); + //因为测试库与生产库是两个库，在生产库中产生的订单号，在测试库中是无法获取到的,所以先写死,再考虑与吴缤研究是否可以将 + //中东港：114 + //驿来特充电站（西点药业湛江路）：85 + String sql = "select * from t_ext_dz_station where station_id=114"; + Record record = Db.findFirst(sql); + + //Record record = getOrderByNo(order_no); if (record == null) { return null; } @@ -122,4 +123,5 @@ public class YltModel { record.set("result", result); Db.save("t_ext_dz_log", "order_no", record); } -} + +} \ No newline at end of file diff --git a/资料/ZhuQue【废弃】/src/main/resource/Sql/test.sql b/ZhuQue/src/main/resource/Sql/test.sql similarity index 100% rename from 资料/ZhuQue【废弃】/src/main/resource/Sql/test.sql rename to ZhuQue/src/main/resource/Sql/test.sql diff --git a/资料/ZhuQue【废弃】/src/main/resource/application.properties b/ZhuQue/src/main/resource/application.properties similarity index 100% rename from 资料/ZhuQue【废弃】/src/main/resource/application.properties rename to ZhuQue/src/main/resource/application.properties diff --git a/资料/ZhuQue【废弃】/src/main/resource/fzby.txt b/ZhuQue/src/main/resource/fzby.txt similarity index 100% rename from 资料/ZhuQue【废弃】/src/main/resource/fzby.txt rename to ZhuQue/src/main/resource/fzby.txt diff --git a/资料/ZhuQue【废弃】/src/main/resource/log4j.properties b/ZhuQue/src/main/resource/log4j.properties similarity index 100% rename from 资料/ZhuQue【废弃】/src/main/resource/log4j.properties rename to ZhuQue/src/main/resource/log4j.properties diff --git a/资料/ZhuQue【废弃】/src/main/resource/logback.xml b/ZhuQue/src/main/resource/logback.xml similarity index 100% rename from 资料/ZhuQue【废弃】/src/main/resource/logback.xml rename to ZhuQue/src/main/resource/logback.xml diff --git a/资料/ZhuQue【废弃】/src/main/resource/undertow.properties b/ZhuQue/src/main/resource/undertow.properties similarity index 95% rename from 资料/ZhuQue【废弃】/src/main/resource/undertow.properties rename to ZhuQue/src/main/resource/undertow.properties index 44cd7ac..b116174 100644 --- a/资料/ZhuQue【废弃】/src/main/resource/undertow.properties +++ b/ZhuQue/src/main/resource/undertow.properties @@ -1,6 +1,6 @@ # true 值支持热加载 undertow.devMode=false -undertow.port=8888 +undertow.port=9000 undertow.host=0.0.0.0 #undertow.resourcePath=/usr/local/tomcat8/webapps/QingLong,classpath:static undertow.resourcePath=D:/dsWork/QingLong/WebRoot,classpath:static diff --git a/资料/ZhuQue【废弃】/生成依赖jar.bat b/ZhuQue/生成依赖jar.bat similarity index 100% rename from 资料/ZhuQue【废弃】/生成依赖jar.bat rename to ZhuQue/生成依赖jar.bat