Przeglądaj źródła

Merge tag 'refs/tags/jenkins-back_end_wechat-171' into release

test
release
Stormeye Wu 7 lat temu
rodzic
commit
d14eda6626
3 zmienionych plików z 70 dodań i 6 usunięć
  1. +61
    -0
      mlWechatOpen/pom.xml
  2. +1
    -4
      mlWechatOpen/src/main/java/com/iformall/controller/WechatCalllbackController.java
  3. +8
    -2
      mlWechatOpen/src/main/java/com/iformall/controller/WxWeappExtSetController.java

+ 61
- 0
mlWechatOpen/pom.xml Wyświetl plik

@@ -41,6 +41,67 @@
<artifactId>spring-boot-maven-plugin</artifactId> <artifactId>spring-boot-maven-plugin</artifactId>
<configuration> <configuration>
<executable>true</executable> <executable>true</executable>
<layout>ZIP</layout>
<excludeGroupIds>
ch.qos.logback,
cn.afterturn,
com.alibaba,
com.amazonaws,
com.fasterxml.jackson.core,
com.fasterxml.jackson.dataformat,
com.fasterxml.jackson.datatype,
com.fasterxml.jackson.module,
com.github.axet,
com.github.binarywang,
com.github.pagehelper,
com.github.ulisesbocchio,
com.google.code.gson,
com.google.guava,
com.google.zxing,
com.puppycrawl.tools,
com.rabbitmq,
com.squareup.okhttp3,
com.thoughtworks.xstream,
commons-io,
io.lettuce,
io.netty,
io.projectreactor,
io.springfox,
io.undertow,
javax.mail,
javax.persistence,
javax.xml.bind,
mysql,
net.bytebuddy,
net.sf.saxon,
org.apache.commons,
org.apache.httpcomponents,
org.apache.logging.log4j
org.apache.poi,
org.apache.rocketmq,
org.apache.shiro,
org.apache.shiro,
org.apache.tomcat.embed,
org.apache.xmlbeans,
org.aspectj,
org.bouncycastle,
org.crazycake,
org.dom4j,
org.hibernate.validator,
org.javassist,
org.jdom,
org.mybatis,
org.mybatis.generator,
org.mybatis.spring.boot,
org.projectlombok,
org.quartz-scheduler,
org.rocketmq.spring.boot,
org.springframework,
org.springframework.amqp,
org.springframework.data,
tk.mybatis,
org.springframework.boot
</excludeGroupIds>
</configuration> </configuration>
</plugin> </plugin>
</plugins> </plugins>


+ 1
- 4
mlWechatOpen/src/main/java/com/iformall/controller/WechatCalllbackController.java Wyświetl plik

@@ -18,10 +18,7 @@ import me.chanjar.weixin.mp.bean.kefu.WxMpKefuMessage;
import me.chanjar.weixin.mp.bean.message.WxMpXmlMessage; import me.chanjar.weixin.mp.bean.message.WxMpXmlMessage;
import me.chanjar.weixin.mp.bean.message.WxMpXmlOutMessage; import me.chanjar.weixin.mp.bean.message.WxMpXmlOutMessage;
import me.chanjar.weixin.open.bean.message.WxOpenXmlMessage; import me.chanjar.weixin.open.bean.message.WxOpenXmlMessage;
import me.chanjar.weixin.open.bean.result.WxOpenAuthorizerInfoResult;
import me.chanjar.weixin.open.bean.result.WxOpenPlatformResult;
import me.chanjar.weixin.open.bean.result.WxOpenQueryAuthResult;
import me.chanjar.weixin.open.bean.result.WxOpenResult;
import me.chanjar.weixin.open.bean.result.*;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;


+ 8
- 2
mlWechatOpen/src/main/java/com/iformall/controller/WxWeappExtSetController.java Wyświetl plik

@@ -73,6 +73,9 @@ public class WxWeappExtSetController extends BaseController {
if(StringUtils.isBlank(weappExtSet.getExtJson())) { if(StringUtils.isBlank(weappExtSet.getExtJson())) {
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL);
} }
if(weappExtSet.getType() == null) {
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL);
}
String extJson = weappExtSet.getExtJson(); String extJson = weappExtSet.getExtJson();
JSONObject obj = JSON.parseObject(extJson); JSONObject obj = JSON.parseObject(extJson);
if(obj == null) { if(obj == null) {
@@ -108,10 +111,13 @@ public class WxWeappExtSetController extends BaseController {
} }
obj.put("ext", extObj); obj.put("ext", extObj);
} }
info.setExtJson(JSON.toJSONString(obj));

WxWeappExtSet newInfo = new WxWeappExtSet();
newInfo.setExtJson(JSON.toJSONString(obj));
newInfo.setId(info.getId());


try { try {
weappExtSetService.saveOrUpdate(info);
weappExtSetService.saveOrUpdate(newInfo);
} catch (Exception e) { } catch (Exception e) {
logger.error("APPID " + info.getAppId() + ", 保存失败 " + e.getMessage()); logger.error("APPID " + info.getAppId() + ", 保存失败 " + e.getMessage());
} }


Ładowanie…
Anuluj
Zapisz