jinguo24@163.com 7 лет назад
Родитель
Сommit
9f3e0aabd5
12 измененных файлов: 41 добавлений и 17 удалений
  1. +21
    -0
      mallinkAdmin/src/main/java/com/simple/UserApplication.java
  2. +7
    -4
      mallinkAdmin/src/main/resources/application-dev.yml
  3. +3
    -3
      mallinkApi/src/main/resources/application-dev.yml
  4. +1
    -1
      mallinkService/src/main/java/com/simple/domain/po/WxEtcpParkTransaction.java
  5. +1
    -1
      mallinkService/src/main/resources/mapper/WxBLogMapper.xml
  6. +1
    -1
      mallinkService/src/main/resources/mapper/WxCLogMapper.xml
  7. +1
    -1
      mallinkService/src/main/resources/mapper/WxCUserCloudMapper.xml
  8. +1
    -1
      mallinkService/src/main/resources/mapper/WxCUserTagsMapper.xml
  9. +1
    -1
      mallinkService/src/main/resources/mapper/WxCouponActivityMapper.xml
  10. +1
    -1
      mallinkService/src/main/resources/mapper/WxCouponMapper.xml
  11. +2
    -2
      mallinkService/src/main/resources/mapper/WxMsgMapper.xml
  12. +1
    -1
      mallinkService/src/main/resources/mapper/WxWebLogMapper.xml

+ 21
- 0
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);
}
}

+ 7
- 4
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分钟


+ 3
- 3
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分钟


+ 1
- 1
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")


+ 1
- 1
mallinkService/src/main/resources/mapper/WxBLogMapper.xml Просмотреть файл

@@ -3,7 +3,7 @@
<mapper namespace="com.simple.mapper.WxBLogMapper">
<resultMap id="BaseResultMap" type="com.simple.domain.po.WxBLog">
<id column="id" jdbcType="INTEGER" property="id" />
<result column="data" jdbcType="JSON" property="data" />
<result column="data" jdbcType="VARCHAR" property="data" />
<result column="create_date" jdbcType="TIMESTAMP" property="createDate" />
</resultMap>


+ 1
- 1
mallinkService/src/main/resources/mapper/WxCLogMapper.xml Просмотреть файл

@@ -3,7 +3,7 @@
<mapper namespace="com.simple.mapper.WxCLogMapper">
<resultMap id="BaseResultMap" type="com.simple.domain.po.WxCLog">
<id column="id" jdbcType="INTEGER" property="id" />
<result column="data" jdbcType="JSON" property="data" />
<result column="data" jdbcType="VARCHAR" property="data" />
<result column="create_date" jdbcType="TIMESTAMP" property="createDate" />
</resultMap>


+ 1
- 1
mallinkService/src/main/resources/mapper/WxCUserCloudMapper.xml Просмотреть файл

@@ -3,7 +3,7 @@
<mapper namespace="com.simple.mapper.WxCUserCloudMapper">
<resultMap id="BaseResultMap" type="com.simple.domain.po.WxCUserCloud">
<id column="id" jdbcType="INTEGER" property="id" />
<result column="cloud_data" jdbcType="JSON" property="cloudData" />
<result column="cloud_data" jdbcType="VARCHAR" property="cloudData" />
<result column="c_user_id" jdbcType="INTEGER" property="cUserId" />
</resultMap>


+ 1
- 1
mallinkService/src/main/resources/mapper/WxCUserTagsMapper.xml Просмотреть файл

@@ -4,7 +4,7 @@
<resultMap id="BaseResultMap" type="com.simple.domain.po.WxCUserTags">
<id column="id" jdbcType="INTEGER" property="id" />
<result column="user_id" jdbcType="INTEGER" property="userId" />
<result column="tags" jdbcType="JSON" property="tags" />
<result column="tags" jdbcType="VARCHAR" property="tags" />
</resultMap>
<sql id="allColumns">


+ 1
- 1
mallinkService/src/main/resources/mapper/WxCouponActivityMapper.xml Просмотреть файл

@@ -19,7 +19,7 @@
<result column="detail" jdbcType="VARCHAR" property="detail" />
<result column="send_type" jdbcType="INTEGER" property="sendType" />
<result column="target_ad" jdbcType="INTEGER" property="targetAd" />
<result column="businesses" jdbcType="JSON" property="businesses" />
<result column="businesses" jdbcType="VARCHAR" property="businesses" />
<result column="price" jdbcType="DECIMAL" property="price" />
<result column="number" jdbcType="INTEGER" property="number" />
<result column="total" jdbcType="INTEGER" property="total" />


+ 1
- 1
mallinkService/src/main/resources/mapper/WxCouponMapper.xml Просмотреть файл

@@ -13,7 +13,7 @@
<result column="price" jdbcType="DECIMAL" property="price" />
<result column="sale_price" jdbcType="DECIMAL" property="salePrice" />
<result column="use_price" jdbcType="DECIMAL" property="usePrice" />
<result column="business" jdbcType="JSON" property="business" />
<result column="business" jdbcType="VARCHAR" property="business" />
<result column="status" jdbcType="INTEGER" property="status" />
<result column="create_date" jdbcType="TIMESTAMP" property="createDate" />
<result column="update_date" jdbcType="TIMESTAMP" property="updateDate" />


+ 2
- 2
mallinkService/src/main/resources/mapper/WxMsgMapper.xml Просмотреть файл

@@ -10,8 +10,8 @@
<result column="expect_send_number" jdbcType="VARCHAR" property="expectSendNumber" />
<result column="success_number" jdbcType="VARCHAR" property="successNumber" />
<result column="error_number" jdbcType="VARCHAR" property="errorNumber" />
<result column="return_result" jdbcType="JSON" property="returnResult" />
<result column="phones" jdbcType="JSON" property="phones" />
<result column="return_result" jdbcType="VARCHAR" property="returnResult" />
<result column="phones" jdbcType="VARCHAR" property="phones" />
</resultMap>
<sql id="allColumns">


+ 1
- 1
mallinkService/src/main/resources/mapper/WxWebLogMapper.xml Просмотреть файл

@@ -3,7 +3,7 @@
<mapper namespace="com.simple.mapper.WxWebLogMapper">
<resultMap id="BaseResultMap" type="com.simple.domain.po.WxWebLog">
<id column="id" jdbcType="INTEGER" property="id" />
<result column="data" jdbcType="JSON" property="data" />
<result column="data" jdbcType="VARCHAR" property="data" />
<result column="create_date" jdbcType="TIMESTAMP" property="createDate" />
</resultMap>


Загрузка…
Отмена
Сохранить