From 9f3e0aabd544f913cfbd118b09a2fae707125533 Mon Sep 17 00:00:00 2001 From: "jinguo24@163.com" Date: Sat, 4 Aug 2018 12:57:39 +0800 Subject: [PATCH] upd --- .../main/java/com/simple/UserApplication.java | 21 +++++++++++++++++++ .../src/main/resources/application-dev.yml | 11 ++++++---- .../src/main/resources/application-dev.yml | 6 +++--- .../domain/po/WxEtcpParkTransaction.java | 2 +- .../main/resources/mapper/WxBLogMapper.xml | 2 +- .../main/resources/mapper/WxCLogMapper.xml | 2 +- .../resources/mapper/WxCUserCloudMapper.xml | 2 +- .../resources/mapper/WxCUserTagsMapper.xml | 2 +- .../mapper/WxCouponActivityMapper.xml | 2 +- .../main/resources/mapper/WxCouponMapper.xml | 2 +- .../src/main/resources/mapper/WxMsgMapper.xml | 4 ++-- .../main/resources/mapper/WxWebLogMapper.xml | 2 +- 12 files changed, 41 insertions(+), 17 deletions(-) create mode 100644 mallinkAdmin/src/main/java/com/simple/UserApplication.java diff --git a/mallinkAdmin/src/main/java/com/simple/UserApplication.java b/mallinkAdmin/src/main/java/com/simple/UserApplication.java new file mode 100644 index 000000000..a16a60136 --- /dev/null +++ b/mallinkAdmin/src/main/java/com/simple/UserApplication.java @@ -0,0 +1,21 @@ +package com.simple; + +import org.mybatis.spring.annotation.MapperScan; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +import springfox.documentation.swagger2.annotations.EnableSwagger2; + +/** + * @author chenkx + * @date 2017-12-26 + */ +@SpringBootApplication +@MapperScan(basePackages = {"com.simple.mapper"}) +@EnableSwagger2 +public class UserApplication { + + public static void main(String[] args) { + SpringApplication.run(UserApplication.class, args); + } +} diff --git a/mallinkAdmin/src/main/resources/application-dev.yml b/mallinkAdmin/src/main/resources/application-dev.yml index 217e09a11..f77289b69 100644 --- a/mallinkAdmin/src/main/resources/application-dev.yml +++ b/mallinkAdmin/src/main/resources/application-dev.yml @@ -1,9 +1,12 @@ spring: # JDBC datasource: - url: jdbc:mysql://47.100.34.187:63306/mallink?characterEncoding=UTF-8&useSSL=false - username: root - password: 1234qwer +# url: jdbc:mysql://127.0.0.1:63306/mallink?characterEncoding=UTF-8&useSSL=false +# username: root +# password: root + url: jdbc:mysql://202.165.179.86:3306/mallink?characterEncoding=UTF-8&useSSL=false + username: mallone + password: m@1l0ne123@# type: com.alibaba.druid.pool.DruidDataSource driver-class-name: com.mysql.jdbc.Driver filters: stat @@ -24,7 +27,7 @@ spring: # REDIS redis: - host: 47.100.34.187 + host: 127.0.0.1 port: 6379 timeout: 0 expire: 1800 #30分钟 diff --git a/mallinkApi/src/main/resources/application-dev.yml b/mallinkApi/src/main/resources/application-dev.yml index 217e09a11..8bcd356f3 100644 --- a/mallinkApi/src/main/resources/application-dev.yml +++ b/mallinkApi/src/main/resources/application-dev.yml @@ -1,9 +1,9 @@ spring: # JDBC datasource: - url: jdbc:mysql://47.100.34.187:63306/mallink?characterEncoding=UTF-8&useSSL=false + url: jdbc:mysql://127.0.0.1:63306/mallink?characterEncoding=UTF-8&useSSL=false username: root - password: 1234qwer + password: root type: com.alibaba.druid.pool.DruidDataSource driver-class-name: com.mysql.jdbc.Driver filters: stat @@ -24,7 +24,7 @@ spring: # REDIS redis: - host: 47.100.34.187 + host: 127.0.0.1 port: 6379 timeout: 0 expire: 1800 #30分钟 diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxEtcpParkTransaction.java b/mallinkService/src/main/java/com/simple/domain/po/WxEtcpParkTransaction.java index aad2bb9d8..2072572dc 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxEtcpParkTransaction.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxEtcpParkTransaction.java @@ -14,7 +14,7 @@ public class WxEtcpParkTransaction extends BaseModel { /*Integer 支付方式(1 微信公众号内支付 2 支付宝 H5 支付 3 微信二维码 4 支付宝二维码 5 微信 H5)**/ - @io.swagger.annotations.ApiModelProperty(value="Integer支付方式(1 微信公众号内支付2 支付宝 H5 支付 3 微信二维码4 支付宝二维码 5 微信 H5)",name="payType") + @io.swagger.annotations.ApiModelProperty(value="支付方式(1 微信公众号内支付2 支付宝 H5 支付 3 微信二维码4 支付宝二维码 5 微信 H5)",name="payType") private Integer payType; /*停车记录标识(查费接口中的 返回的 orderId 字段)**/ @io.swagger.annotations.ApiModelProperty(value="停车记录标识(查费接口中的 返回的 orderId 字段)",name="synId") diff --git a/mallinkService/src/main/resources/mapper/WxBLogMapper.xml b/mallinkService/src/main/resources/mapper/WxBLogMapper.xml index fb5dc1561..efdc285f3 100644 --- a/mallinkService/src/main/resources/mapper/WxBLogMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBLogMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/mallinkService/src/main/resources/mapper/WxCLogMapper.xml b/mallinkService/src/main/resources/mapper/WxCLogMapper.xml index b17e81a4c..590035d4a 100644 --- a/mallinkService/src/main/resources/mapper/WxCLogMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCLogMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/mallinkService/src/main/resources/mapper/WxCUserCloudMapper.xml b/mallinkService/src/main/resources/mapper/WxCUserCloudMapper.xml index 77c64435f..6580ad6fb 100644 --- a/mallinkService/src/main/resources/mapper/WxCUserCloudMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCUserCloudMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/mallinkService/src/main/resources/mapper/WxCUserTagsMapper.xml b/mallinkService/src/main/resources/mapper/WxCUserTagsMapper.xml index 00c2a170d..6afaa87ff 100644 --- a/mallinkService/src/main/resources/mapper/WxCUserTagsMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCUserTagsMapper.xml @@ -4,7 +4,7 @@ - + diff --git a/mallinkService/src/main/resources/mapper/WxCouponActivityMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponActivityMapper.xml index 346552137..045670973 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponActivityMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponActivityMapper.xml @@ -19,7 +19,7 @@ - + diff --git a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml index 9f5fcc84e..187039093 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml @@ -13,7 +13,7 @@ - + diff --git a/mallinkService/src/main/resources/mapper/WxMsgMapper.xml b/mallinkService/src/main/resources/mapper/WxMsgMapper.xml index 5df6dfa7b..95f444ce0 100644 --- a/mallinkService/src/main/resources/mapper/WxMsgMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMsgMapper.xml @@ -10,8 +10,8 @@ - - + + diff --git a/mallinkService/src/main/resources/mapper/WxWebLogMapper.xml b/mallinkService/src/main/resources/mapper/WxWebLogMapper.xml index c0eaba31a..79ccec951 100644 --- a/mallinkService/src/main/resources/mapper/WxWebLogMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxWebLogMapper.xml @@ -3,7 +3,7 @@ - +