diff --git a/cweb/src/main/java/com/cweb/controller/BsDiscountUserController.java b/cweb/src/main/java/com/cweb/controller/BsDiscountUserController.java index f3860b6..964ec4f 100644 --- a/cweb/src/main/java/com/cweb/controller/BsDiscountUserController.java +++ b/cweb/src/main/java/com/cweb/controller/BsDiscountUserController.java @@ -96,7 +96,7 @@ public class BsDiscountUserController { @RequestMapping(value="/useDiscountList",method = RequestMethod.GET) @ResponseBody @ApiOperation(value = "加油优惠券列表") - public ResponseData useDiscountList(@RequestParam(name = "use", required = true) Integer useScope, + public ResponseData useDiscountList(@RequestParam(name = "useScope", required = true) Integer useScope, @RequestParam(name = "merNo", required = true) String merNo, @RequestParam(name = "refuelPrice", required = false) BigDecimal refuelPrice) { try { diff --git a/openapi/target/classes/application.yml b/openapi/target/classes/application.yml deleted file mode 100644 index 207b030..0000000 --- a/openapi/target/classes/application.yml +++ /dev/null @@ -1,105 +0,0 @@ -server: - port: 9805 - servlet: - context-path: /openapi - -#配置是否为debug模式，debug模式下，不开启权限校验 -debug: false - -#datasource数据源设置 -spring: - datasource: - url: jdbc:mysql://139.9.154.68:3306/hai_oil?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false - username: root - password: HF123456. - type: com.alibaba.druid.pool.DruidDataSource - driver-class-name: com.mysql.jdbc.Driver - filters: stat - maxActive: 10 - initialSize: 5 - maxWait: 60000 - minIdle: 5 - timeBetweenEvictionRunsMillis: 60000 - minEvictableIdleTimeMillis: 300000 - validationQuery: select 'x' - testWhileIdle: true - testOnBorrow: false - testOnReturn: false - poolPreparedStatements: true - maxOpenPreparedStatements: 20 - redis: - database: 2 - host: 139.9.154.68 - port: 36379 - password: HF123456.Redis - timeout: 1000 - jedis: - pool: - max-active: 20 - max-wait: -1 - max-idle: 10 - min-idle: 0 - #MQTT配置信息 - mqtt: - #MQTT服务地址 - url: ws://139.9.154.68:8083/mqtt - #用户名 - username: printer_provider - #密码 - password: 123654 - #客户端id(不能重复) - # client: - # id: provider-id - #MQTT默认的消息推送主题，实际可在调用接口是指定 - # default: - # topic: topic - #配置日期返回至前台为时间戳 - jackson: - serialization: - write-dates-as-timestamps: true - -rocketmq: - name-server: 139.9.154.68:9876 - producer: - access-key: huifukeji - secret-key: HF123456. - #必须指定group - group: default-group - consumer: - access-key: huifukeji - secret-key: HF123456. - -jetcache: - statIntervalMinutes: 15 - areaInCacheName: false - local: - default: - type: linkedhashmap - keyConvertor: fastjson - remote: - default: - type: redis - host: 139.9.154.68 - port: 36379 - password: HF123456.Redis - database: 2 - keyConvertor: fastjson - broadcastChannel: projectA - valueEncoder: java - valueDecoder: java - poolConfig: - minIdle: 5 - maxIdle: 20 - maxTotal: 50 - -mybatis: - mapperLocations: - - classpath*:sqlmap*/*.xml - type-aliases-package: - org.springboot.sample.entity - -pagehelper: - helperDialect: mysql - reasonable: true - supportMethodsArguments: true - params: count=countSql diff --git a/openapi/target/classes/com/OpenApiApplication.class b/openapi/target/classes/com/OpenApiApplication.class deleted file mode 100644 index ee25d87..0000000 Binary files a/openapi/target/classes/com/OpenApiApplication.class and /dev/null differ diff --git a/openapi/target/classes/com/openapi/config/AuthConfig$1.class b/openapi/target/classes/com/openapi/config/AuthConfig$1.class deleted file mode 100644 index 13471cb..0000000 Binary files a/openapi/target/classes/com/openapi/config/AuthConfig$1.class and /dev/null differ diff --git a/openapi/target/classes/com/openapi/config/AuthConfig.class b/openapi/target/classes/com/openapi/config/AuthConfig.class deleted file mode 100644 index 3236ed0..0000000 Binary files a/openapi/target/classes/com/openapi/config/AuthConfig.class and /dev/null differ diff --git a/openapi/target/classes/com/openapi/config/ConfigListener.class b/openapi/target/classes/com/openapi/config/ConfigListener.class deleted file mode 100644 index 94a2017..0000000 Binary files a/openapi/target/classes/com/openapi/config/ConfigListener.class and /dev/null differ diff --git a/openapi/target/classes/com/openapi/config/CorsConfig.class b/openapi/target/classes/com/openapi/config/CorsConfig.class deleted file mode 100644 index 4d74bbf..0000000 Binary files a/openapi/target/classes/com/openapi/config/CorsConfig.class and /dev/null differ diff --git a/openapi/target/classes/com/openapi/config/MultipartConfig.class b/openapi/target/classes/com/openapi/config/MultipartConfig.class deleted file mode 100644 index 1dcd4f0..0000000 Binary files a/openapi/target/classes/com/openapi/config/MultipartConfig.class and /dev/null differ diff --git a/openapi/target/classes/com/openapi/config/RedisConfig.class b/openapi/target/classes/com/openapi/config/RedisConfig.class deleted file mode 100644 index 4c85f09..0000000 Binary files a/openapi/target/classes/com/openapi/config/RedisConfig.class and /dev/null differ diff --git a/openapi/target/classes/com/openapi/config/SwaggerConfig.class b/openapi/target/classes/com/openapi/config/SwaggerConfig.class deleted file mode 100644 index e0af5cd..0000000 Binary files a/openapi/target/classes/com/openapi/config/SwaggerConfig.class and /dev/null differ diff --git a/openapi/target/classes/com/openapi/config/SysConfig.class b/openapi/target/classes/com/openapi/config/SysConfig.class deleted file mode 100644 index 0f94e7e..0000000 Binary files a/openapi/target/classes/com/openapi/config/SysConfig.class and /dev/null differ diff --git a/openapi/target/classes/com/openapi/config/SysConst.class b/openapi/target/classes/com/openapi/config/SysConst.class deleted file mode 100644 index 3642589..0000000 Binary files a/openapi/target/classes/com/openapi/config/SysConst.class and /dev/null differ diff --git a/openapi/target/classes/com/openapi/controller/BsDiscountController.class b/openapi/target/classes/com/openapi/controller/BsDiscountController.class deleted file mode 100644 index 5573c42..0000000 Binary files a/openapi/target/classes/com/openapi/controller/BsDiscountController.class and /dev/null differ diff --git a/openapi/target/classes/config.properties b/openapi/target/classes/config.properties deleted file mode 100644 index 9ee346e..0000000 --- a/openapi/target/classes/config.properties +++ /dev/null @@ -1 +0,0 @@ -fileUrl=/home/project/oil/filesystem diff --git a/openapi/target/classes/logback.xml b/openapi/target/classes/logback.xml deleted file mode 100644 index 9382585..0000000 --- a/openapi/target/classes/logback.xml +++ /dev/null @@ -1,72 +0,0 @@ - - - - - %d %p (%file:%line\)- %m%n - UTF-8 - - - - log/base.log - - log/base.log.%d.%i - - - 64 MB - - - - - %d %p (%file:%line\)- %m%n - - UTF-8 - - - - log/dao.log - - log/dao.log.%d.%i - - - 64 MB - - - - - %d %p (%file:%line\)- %m%n - - UTF-8 - - - - log/error.log - - log/error.log.%d.%i - - - 64 MB - - - - - %d %p (%file:%line\)- %m%n - - UTF-8 - - - - - - - - - - - - - - - diff --git a/openapi/target/maven-archiver/pom.properties b/openapi/target/maven-archiver/pom.properties deleted file mode 100644 index dce2cbc..0000000 --- a/openapi/target/maven-archiver/pom.properties +++ /dev/null @@ -1,4 +0,0 @@ -#Created by Apache Maven 3.6.3 -version=1.0-SNAPSHOT -groupId=com.hfkj -artifactId=oil-openapi diff --git a/openapi/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/openapi/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst deleted file mode 100644 index f6efa7c..0000000 --- a/openapi/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst +++ /dev/null @@ -1,12 +0,0 @@ -com\openapi\config\RedisConfig.class -com\openapi\config\SysConst.class -com\openapi\config\RestExceptionHandler.class -com\openapi\config\AuthConfig.class -com\OpenApiApplication.class -com\openapi\config\SwaggerConfig.class -com\openapi\controller\BsDiscountController.class -com\openapi\config\MultipartConfig.class -com\openapi\config\SysConfig.class -com\openapi\config\AuthConfig$1.class -com\openapi\config\ConfigListener.class -com\openapi\config\CorsConfig.class diff --git a/openapi/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/openapi/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst deleted file mode 100644 index c8a42d3..0000000 --- a/openapi/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst +++ /dev/null @@ -1,11 +0,0 @@ -D:\hurui\huifu\hai-oil-server\openapi\src\main\java\com\openapi\config\SysConfig.java -D:\hurui\huifu\hai-oil-server\openapi\src\main\java\com\openapi\controller\BsDiscountController.java -D:\hurui\huifu\hai-oil-server\openapi\src\main\java\com\openapi\config\SwaggerConfig.java -D:\hurui\huifu\hai-oil-server\openapi\src\main\java\com\OpenApiApplication.java -D:\hurui\huifu\hai-oil-server\openapi\src\main\java\com\openapi\config\AuthConfig.java -D:\hurui\huifu\hai-oil-server\openapi\src\main\java\com\openapi\config\MultipartConfig.java -D:\hurui\huifu\hai-oil-server\openapi\src\main\java\com\openapi\config\SysConst.java -D:\hurui\huifu\hai-oil-server\openapi\src\main\java\com\openapi\config\ConfigListener.java -D:\hurui\huifu\hai-oil-server\openapi\src\main\java\com\openapi\config\CorsConfig.java -D:\hurui\huifu\hai-oil-server\openapi\src\main\java\com\openapi\config\RestExceptionHandler.java -D:\hurui\huifu\hai-oil-server\openapi\src\main\java\com\openapi\config\RedisConfig.java diff --git a/openapi/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst b/openapi/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst deleted file mode 100644 index e69de29..0000000 diff --git a/openapi/target/oil-openapi-1.0-SNAPSHOT.jar b/openapi/target/oil-openapi-1.0-SNAPSHOT.jar deleted file mode 100644 index ae007e2..0000000 Binary files a/openapi/target/oil-openapi-1.0-SNAPSHOT.jar and /dev/null differ diff --git a/openapi/target/oil-openapi-1.0-SNAPSHOT.jar.original b/openapi/target/oil-openapi-1.0-SNAPSHOT.jar.original deleted file mode 100644 index 6f06b56..0000000 Binary files a/openapi/target/oil-openapi-1.0-SNAPSHOT.jar.original and /dev/null differ