Просмотр исходного кода

solve bug

release_toaliyun_real
xhxu 5 лет назад
Родитель
Сommit
0125c0c481
4 измененных файлов: 13 добавлений и 2 удалений
  1. +5
    -1
      mallinkAdmin/src/main/resources/db/migration/V202104090001__for_wx_third_party_config.sql
  2. +3
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxThirdPartyConfig.java
  3. +3
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxGooagooServiceImpl.java
  4. +2
    -1
      mallinkService/src/main/resources/mapper/WxThirdPartyConfigMapper.xml

+ 5
- 1
mallinkAdmin/src/main/resources/db/migration/V202104090001__for_wx_third_party_config.sql Просмотреть файл

@@ -13,4 +13,8 @@ CREATE TABLE `wx_third_party_config` (
`password` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '登陆密码',
`version` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '接口版本',
PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci ROW_FORMAT = Dynamic;
) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci ROW_FORMAT = Dynamic;


ALTER TABLE `mallink`.`wx_third_party_config`
ADD COLUMN `tp_id` varchar(100) AFTER `version`;

+ 3
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxThirdPartyConfig.java Просмотреть файл

@@ -43,5 +43,8 @@ public class WxThirdPartyConfig extends TenantEntity {
@io.swagger.annotations.ApiModelProperty(value="",name="version")
private String version;

@io.swagger.annotations.ApiModelProperty(value="",name="tpId")
private String tpId;
}

+ 3
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxGooagooServiceImpl.java Просмотреть файл

@@ -53,6 +53,9 @@ public class WxGooagooServiceImpl implements WxGooagooService {
}
Map<String,String> paramMap = this.getParamMap(config);
paramMap.put("lowerMethod",url);
List<String> sl = new ArrayList<>();
sl.add(config.getTpId());
params.put("shopIds", sl);
paramMap.put("data", JSONUtils.toJSONString(params));

String sign= SignUtils.sign(config.getSignKey(),paramMap);


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

@@ -15,10 +15,11 @@
<result column="user_name" jdbcType="VARCHAR" property="userName"/>
<result column="password" jdbcType="VARCHAR" property="password"/>
<result column="version" jdbcType="VARCHAR" property="version"/>
<result column="tp_id" jdbcType="VARCHAR" property="tpId"/>
</resultMap>

<sql id="allColumns">
`id`,`tenant_id`,`parent_tenant_id`,`type`,`app_id`,`app_key`,`sign_key`,`api_url`, `token`,`token_expired_time`,`user_name`,`password`,`version`
`id`,`tenant_id`,`parent_tenant_id`,`type`,`app_id`,`app_key`,`sign_key`,`api_url`, `token`,`token_expired_time`,`user_name`,`password`,`version`,`tp_id`
</sql>

<sql id="dynamicWhereConditions">


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