xhxu 5 лет назад
Родитель
Сommit
2e653ded98
16 измененных файлов: 107 добавлений и 22 удалений
  1. +11
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/datatower/DataTowerController.java
  2. +1
    -1
      mallinkAdmin/src/main/resources/application-prod.yml
  3. +8
    -1
      mallinkAdmin/src/main/resources/db/migration/V202102260001__wx_rent_contract.sql
  4. +1
    -1
      mallinkBApi/src/main/resources/application-prod.yml
  5. +1
    -1
      mallinkCApi/src/main/resources/application-prod.yml
  6. +1
    -1
      mallinkCallback/src/main/resources/application-prod.yml
  7. +1
    -1
      mallinkMQConsumer/src/main/resources/application-prod.yml
  8. +1
    -1
      mallinkPosApi/src/main/resources/application-prod.yml
  9. +1
    -1
      mallinkPublicApi/src/main/resources/application-prod.yml
  10. +1
    -1
      mallinkSchedule/src/main/resources/application-prod.yml
  11. +2
    -0
      mallinkService/src/main/java/com/iformall/service/DataTowerService.java
  12. +18
    -0
      mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java
  13. +27
    -9
      mallinkService/src/main/java/com/iformall/sms/wiwide/WiwideUtil.java
  14. +31
    -2
      mallinkService/src/main/java/com/iformall/utils/HttpUtil.java
  15. +1
    -1
      mallinkSysAdmin/src/main/resources/application-prod.yml
  16. +1
    -1
      mallinkWebSocketServer/src/main/resources/application-prod.yml

+ 11
- 0
mallinkAdmin/src/main/java/com/iformall/controller/datatower/DataTowerController.java Просмотреть файл

@@ -116,4 +116,15 @@ public class DataTowerController extends BaseController {
return dataTowerService.queryWiWideDataUrl(getTenantInfo(),requrl,params);
}

@ApiOperation("调取图片")
@GetMapping("/getWiWidePic")
@SystemControllerLog(description = "数据塔台-获取图片")
public String getWiWidePic(String type,String id) {
logger.debug("[" + getIpAddr() + "] DataTowerController::getWiWidePic");
if(StringUtils.isBlank(type) || StringUtils.isBlank(id)){
return null;
}
return dataTowerService.getWiWidePic(getTenantInfo(),type,id);
}

}

+ 1
- 1
mallinkAdmin/src/main/resources/application-prod.yml Просмотреть файл

@@ -58,7 +58,7 @@ spring:
# EMAIL
mail:
host: smtp.exmail.qq.com
username: sysadministor@iformall.com # 登陆密码sysAdmin1231
username: sysadministor@iformall.com # 登陆密码sysAd1231
password: SWqPekCEmhUYuYCd # 授权密码
properties:
mail:


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

@@ -1,4 +1,11 @@
ALTER TABLE `wx_rent_contract`
ADD COLUMN `cashtype_content_lsit` json COMMENT '押金明细' AFTER `deposit`,
ADD COLUMN `cashtype_lsit` json COMMENT '押金明细' AFTER `cashtype_content_lsit`,
ADD COLUMN `other_rent_price_info` json COMMENT '其他租金单价' AFTER `rent_price`;
ADD COLUMN `other_rent_price_info` json COMMENT '其他租金单价' AFTER `rent_price`;


--单店铺

--多店铺合铺

--多店铺分铺

+ 1
- 1
mallinkBApi/src/main/resources/application-prod.yml Просмотреть файл

@@ -57,7 +57,7 @@ spring:
# EMAIL
mail:
host: smtp.exmail.qq.com
username: sysadministor@iformall.com # 登陆密码sysAdmin1231
username: sysadministor@iformall.com # 登陆密码sysAd1231
password: SWqPekCEmhUYuYCd # 授权密码
properties:
mail:


+ 1
- 1
mallinkCApi/src/main/resources/application-prod.yml Просмотреть файл

@@ -57,7 +57,7 @@ spring:
# EMAIL
mail:
host: smtp.exmail.qq.com
username: sysadministor@iformall.com # 登陆密码sysAdmin1231
username: sysadministor@iformall.com # 登陆密码sysAd1231
password: SWqPekCEmhUYuYCd # 授权密码
properties:
mail:


+ 1
- 1
mallinkCallback/src/main/resources/application-prod.yml Просмотреть файл

@@ -58,7 +58,7 @@ spring:
# EMAIL
mail:
host: smtp.exmail.qq.com
username: sysadministor@iformall.com # 登陆密码sysAdmin1231
username: sysadministor@iformall.com # 登陆密码sysAd1231
password: SWqPekCEmhUYuYCd # 授权密码
properties:
mail:


+ 1
- 1
mallinkMQConsumer/src/main/resources/application-prod.yml Просмотреть файл

@@ -57,7 +57,7 @@ spring:
# EMAIL
mail:
host: smtp.exmail.qq.com
username: sysadministor@iformall.com # 登陆密码sysAdmin1231
username: sysadministor@iformall.com # 登陆密码sysAd1231
password: SWqPekCEmhUYuYCd # 授权密码
properties:
mail:


+ 1
- 1
mallinkPosApi/src/main/resources/application-prod.yml Просмотреть файл

@@ -56,7 +56,7 @@ spring:
# EMAIL
mail:
host: smtp.exmail.qq.com
username: sysadministor@iformall.com # 登陆密码sysAdmin1231
username: sysadministor@iformall.com # 登陆密码sysAd1231
password: SWqPekCEmhUYuYCd # 授权密码
properties:
mail:


+ 1
- 1
mallinkPublicApi/src/main/resources/application-prod.yml Просмотреть файл

@@ -57,7 +57,7 @@ spring:
# EMAIL
mail:
host: smtp.exmail.qq.com
username: sysadministor@iformall.com # 登陆密码sysAdmin1231
username: sysadministor@iformall.com # 登陆密码sysAd1231
password: SWqPekCEmhUYuYCd # 授权密码
properties:
mail:


+ 1
- 1
mallinkSchedule/src/main/resources/application-prod.yml Просмотреть файл

@@ -57,7 +57,7 @@ spring:
# EMAIL
mail:
host: smtp.exmail.qq.com
username: sysadministor@iformall.com # 登陆密码sysAdmin1231
username: sysadministor@iformall.com # 登陆密码sysAd1231
password: SWqPekCEmhUYuYCd # 授权密码
properties:
mail:


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

@@ -22,4 +22,6 @@ public interface DataTowerService {
ResultData queryCustomerData(TenantEntity tenantEntity, Map<String, String> params);

ResultData queryWiWideDataUrl(TenantEntity tenantInfo, String url, Map<String, Object> params);

String getWiWidePic(TenantEntity tenantInfo, String type, String id);
}

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

@@ -959,6 +959,24 @@ public class DataTowerServiceImpl implements DataTowerService {
}
}

@Override
public String getWiWidePic(TenantEntity tenantEntity, String type, String id) {
WxWiWideInfo wiWideInfo = new WxWiWideInfo();
wiWideInfo.updateTenantInfo(tenantEntity);
List<WxWiWideInfo> list = wxWiwideInfoMapper.findList(wiWideInfo);
if (list.isEmpty()){
return null;
}
wiWideInfo = list.get(0);
String wiwideUrl = wiWideInfo.getWiwideUrl();
WiwideSercret wiwideSercret = getWiwideSercret(wiWideInfo);
if(wiwideSercret == null){
return null;
}
String sign = WiwideEntry.encrypt(wiWideInfo);
return WiwideUtil.getWiWidePic(wiwideUrl,sign,type,id);
}

public TreeMap getTimeTreeMap() {
TreeMap<Object, Object> timemap = new TreeMap();
timemap.put("06:00", 0);


+ 27
- 9
mallinkService/src/main/java/com/iformall/sms/wiwide/WiwideUtil.java Просмотреть файл

@@ -24,6 +24,7 @@ public class WiwideUtil implements SMSExcutor {
private static final String addTemplateUrl = "https://webapp.wiwide.com/apisms/addtemplate";
private static final String smsSendUrl = "https://webapp.wiwide.com/apisms/send";


@Override
public String sendMsg(String secret, String bid, String publickey, String phone, String signature, String msg, String notifyUrl, String verifysms, Integer modelId, String templateParam, String templateCode, String outId) {
return sendMsg(secret, bid, publickey, phone, signature, msg, notifyUrl,
@@ -219,6 +220,10 @@ public class WiwideUtil implements SMSExcutor {
String data = HttpUtil.doPostWiwideNew(url, sign, params);
return data;
}

public static String getWiWidePic(String url,String sign, String type, String id) {
return HttpUtil.doWiwidePicGet(url+"/api/reports/pictures/get_picture?type="+type+"&id="+id,sign);
}
public static void main(String[] args) {
Map<String, String> params = new HashMap<>(2);
@@ -237,16 +242,29 @@ public class WiwideUtil implements SMSExcutor {
wiWideInfo.setWiwideKey(secretKey);
String sign = WiwideEntry.encrypt(wiWideInfo);

Map<String, Object> param = new HashMap<>();
param.put("pageStart",1);
param.put("pageSize",10);
param.put("key",0);
param.put("value","");
param.put("placeStatus",0);


String s = queryDataNew("http://140.143.33.245" + "/api/place/place", sign, param);
System.out.println(DataUtil.unicodeToUtf8(s));
String s = HttpUtil.doWiwidePicGet("http://140.143.33.245" + "/api/reports/pictures/get_picture?type=pic&id=b3b30445674bb49840e64c2f8b0be347", sign);
System.out.println(s);

// Map<String, Object> param = new HashMap<>();
// param.put("type","pic");
// param.put("id","b3b30445674bb49840e64c2f8b0be347");
//
//
//
// String s = queryDataNew("http://140.143.33.245" + "/api/reports/pictures/get_picture", sign, param);
// System.out.println(DataUtil.unicodeToUtf8(s));

// Map<String, Object> param = new HashMap<>();
// param.put("pageStart",1);
// param.put("pageSize",10);
// param.put("key",0);
// param.put("value","");
// param.put("placeStatus",0);
//
//
// String s = queryDataNew("http://140.143.33.245" + "/api/place/place", sign, param);
// System.out.println(DataUtil.unicodeToUtf8(s));
}

}


+ 31
- 2
mallinkService/src/main/java/com/iformall/utils/HttpUtil.java Просмотреть файл

@@ -79,6 +79,35 @@ public class HttpUtil {
return null;
}

/**
* get请求
* @return
*/
public static String doWiwidePicGet(String url, String signature) {
try {
CloseableHttpClient client = HttpClients.createDefault();
//发送get请求
HttpGet request = new HttpGet(url);
request.setHeader("Cookie", "Signature="+signature);

HttpResponse response = client.execute(request);

/**请求发送成功,并得到响应**/
if (response.getStatusLine().getStatusCode() == HttpStatus.SC_OK) {
/**读取服务器返回过来的json字符串数据**/
String strResult = EntityUtils.toString(response.getEntity());

return strResult;
}
}
catch (IOException e) {
logger.error(e.getMessage());
throw new RuntimeException(e);
}

return null;
}

/**
* post请求(用于key-value格式的参数)
* @param url
@@ -212,7 +241,7 @@ public class HttpUtil {
* @param params
* @return
*/
public static String doPostWiwideNew(String url, String cookie, Map params){
public static String doPostWiwideNew(String url, String signature, Map params){

//CookieStore store= new BasicCookieStore();
//HttpClients.custom().setDefaultCookieStore(store).build();
@@ -229,7 +258,7 @@ public class HttpUtil {
request.setURI(new URI(url));
request.setHeader("Content-Type", "application/x-www-form-urlencoded");
request.setHeader("Accept-Charset", "utf-8");
request.setHeader("Cookie", "Signature="+cookie);
request.setHeader("Cookie", "Signature="+signature);

//设置参数
List<NameValuePair> nvps = new ArrayList<NameValuePair>();


+ 1
- 1
mallinkSysAdmin/src/main/resources/application-prod.yml Просмотреть файл

@@ -57,7 +57,7 @@ spring:
# EMAIL
mail:
host: smtp.exmail.qq.com
username: sysadministor@iformall.com # 登陆密码sysAdmin1231
username: sysadministor@iformall.com # 登陆密码sysAd1231
password: SWqPekCEmhUYuYCd # 授权密码
properties:
mail:


+ 1
- 1
mallinkWebSocketServer/src/main/resources/application-prod.yml Просмотреть файл

@@ -57,7 +57,7 @@ spring:
# EMAIL
mail:
host: smtp.exmail.qq.com
username: sysadministor@iformall.com # 登陆密码sysAdmin1231
username: sysadministor@iformall.com # 登陆密码sysAd1231
password: SWqPekCEmhUYuYCd # 授权密码
properties:
mail:


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