Commit 431506c6 by jx-art

调用注解补充

parent 0d305864
Pipeline #43198 passed with stages
in 1 minute 50 seconds
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
<netease.ddb.version>4.6.0.4</netease.ddb.version> <netease.ddb.version>4.6.0.4</netease.ddb.version>
<!-- store-db --> <!-- store-db -->
<mysql.version>5.1.34</mysql.version> <mysql.version>8.0.15</mysql.version>
<mybatis.spring.boot.starter.version>1.1.1</mybatis.spring.boot.starter.version> <mybatis.spring.boot.starter.version>1.1.1</mybatis.spring.boot.starter.version>
<!-- store-redis --> <!-- store-redis -->
...@@ -384,6 +384,16 @@ ...@@ -384,6 +384,16 @@
</exclusion> </exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger2</artifactId>
<version>2.7.0</version>
</dependency>
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger-ui</artifactId>
<version>2.7.0</version>
</dependency>
<!--qc --> <!--qc -->
<!--<dependency>--> <!--<dependency>-->
<!-- <groupId>com.netease.yanxuan</groupId>--> <!-- <groupId>com.netease.yanxuan</groupId>-->
......
...@@ -61,12 +61,12 @@ public class UasClientServiceImpl implements UasClientService { ...@@ -61,12 +61,12 @@ public class UasClientServiceImpl implements UasClientService {
params.put("cc", StringUtils.join(ccList, ",")); params.put("cc", StringUtils.join(ccList, ","));
} }
logger.info(JSONObject.toJSONString(params)); logger.info(JSONObject.toJSONString(params));
String res = service.sendEmail1(params); //String res = service.sendEmail1(params);
this.logger.info("[op:sendEmail] res={} ", new Object[]{res}); // this.logger.info("[op:sendEmail] res={} ", new Object[]{res});
JSONObject jsonObject = JSON.parseObject(res); // JSONObject jsonObject = JSON.parseObject(res);
if (jsonObject.getInteger("code") != 200) { // if (jsonObject.getInteger("code") != 200) {
this.logger.error("SendEmail", (String)null, "send email failed, subject={},toList={},ccList={}", new Object[]{subject, JSON.toJSONString(toList), JSON.toJSONString(ccList)}); // this.logger.error("SendEmail", (String)null, "send email failed, subject={},toList={},ccList={}", new Object[]{subject, JSON.toJSONString(toList), JSON.toJSONString(ccList)});
} // }
} }
} }
......
...@@ -3,6 +3,7 @@ package com.netease.mail.yanxuan.change.integration.flow.email; ...@@ -3,6 +3,7 @@ package com.netease.mail.yanxuan.change.integration.flow.email;
import com.netease.yanxuan.missa.client.annotation.MissaClient; import com.netease.yanxuan.missa.client.annotation.MissaClient;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import java.util.Map; import java.util.Map;
...@@ -18,11 +19,8 @@ public interface EmailRpcService { ...@@ -18,11 +19,8 @@ public interface EmailRpcService {
String sendEmail(Map<String, String> params); String sendEmail(Map<String, String> params);
@PostMapping("/push/email/qc/upload.json")
String sendEmail1(Map<String, String> params);
@PostMapping("/push/email/qc") @PostMapping("/push/email/qc")
String sendEmail2(Map<String, String> params); String sendEmail2(@RequestBody Map<String, String> params);
//yanxuan-sc-ehc //yanxuan-sc-ehc
......
...@@ -151,7 +151,7 @@ public class ChangeConfigController { ...@@ -151,7 +151,7 @@ public class ChangeConfigController {
ArrayList<String> strings = new ArrayList<>(); ArrayList<String> strings = new ArrayList<>();
logger.info("调用接口~~~~~~~~~~~~~~~~~~~~~~~~"); logger.info("调用接口~~~~~~~~~~~~~~~~~~~~~~~~");
strings.add("wb.tanglongwei@mesg.corp.netease.com"); strings.add("wb.tanglongwei@mesg.corp.netease.com");
iEmailService.sendEmail2("yxqc_release_flow","{\n" + iEmailService.sendEmail2("yanxuan-qc-change-system","{\n" +
" \"flowId\":\"工单ID\",\n" + " \"flowId\":\"工单ID\",\n" +
" \"releaseId\":\"发起人账号\",\n" + " \"releaseId\":\"发起人账号\",\n" +
" \"releaseName\":\"发起人姓名\",\n" + " \"releaseName\":\"发起人姓名\",\n" +
......
dschedule.enable=true
dschedule.env=test
dschedule.app-id=yanxuan-sc-ehc
dschedule.job-group=235
dschedule.enable-auto-register=true
dschedule.executor-fail-strategy=fail_alarm
dschedule.alarm-email=wb.tanglongwei@mesg.corp.netease.com
dschedule.adminAddresses=http://127.0.0.1:8550/proxy/test.dschedule-admin.service.mailsaas/
# mysql
spring.datasource.driver-class-name=com.mysql.jdbc.Driver
spring.datasource.url=jdbc:mysql://112.74.86.21/tb_yx_link?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&serverTimezone=Asia/Shanghai
spring.datasource.username=root
spring.datasource.password=wangjiaxiang
#tomcat
server.tomcat.max-threads=600
server.tomcat.uri-encoding=UTF-8
server.tomcat.basedir=/home/logs/access
server.tomcat.accesslog.enabled=true
server.tomcat.accesslog.pattern=%h %l %u %t "%r" %s %b %{X-Forwarded-For}i %D %{P_INFO}c %{Referer}i %{User-Agent}i %{Host}i
# mybatis
mybatis.mapper-locations=classpath:mybatis/mapper/*.xml
mybatis.configuration.cache-enabled=true
mybatis.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
mybatis.configuration.map-underscore-to-camel-case=true
# redis
spring.redis.host=localhost
spring.redis.password=
spring.redis.database=0
spring.redis.port=6379
spring.redis.timeout=3000
spring.redis.jedis.pool.max-active=8
spring.redis.jedis.pool.max-wait=-1
spring.redis.jedis.pool.max-idle=500
spring.redis.jedis.pool.min-idle=0
spring.redis.lettuce.shutdown-timeout=0
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment