Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

common/common-entity/src/main/java/com/yihu/jw/entity/care/course/RecruitStudentsDO.java

@@ -32,6 +32,10 @@ public class RecruitStudentsDO  extends UuidIdentityEntityWithTime {
     *'招生主题'
     */
    private String theme;
    /**
     * 招生名称
     */
    private String name;
    /**
     *'报名开始时间'
     */
@@ -139,4 +143,13 @@ public class RecruitStudentsDO  extends UuidIdentityEntityWithTime {
    public void setDel(Integer del) {
        this.del = del;
    }
    @Column(name = "name")
    public String getName() {
        return name;
    }
    public void setName(String name) {
        this.name = name;
    }
}

svr/svr-base/src/main/resources/application.yml

@@ -609,7 +609,7 @@ spring:
      connection-timeout: 60000 # Connection timeout in milliseconds.
      multi-threaded: true # Enable connection requests from multiple execution threads.
  activemq:
    broker-url: tcp://172.19.103.87:61616
    broker-url: tcp://172.26.0.12:61616
    user: admin
    password: admin
  redis:

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/endpoint/wechat/WechatCoreController.java

@@ -44,7 +44,8 @@ public class WechatCoreController extends EnvelopRestEndpoint {
    private WxAccessTokenService wxAccessTokenService;
    @Value("${wechat.id}")
    private String wechatId;
    private static String wechat_token ="xAeQrX7uOD0OusIZ5JUQzrLPYIQBlqbS" ;
    @Value("${wechat.wechat_token}")
    private String wechat_token ;
    @Autowired
    private WxPushLogDao wxPushLogDao;

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/course/CourseService.java

@@ -739,7 +739,7 @@ public class CourseService {
        recordDO.setPatientName(patientDO.getName());
        recordDO.setPrice(recruitStudentsDO.getFee());
        recordDO.setSex(IdCardUtil.getSex(patientDO.getSex(),patientDO.getIdcard()));
        recordDO.setRecruitName(recruitStudentsDO.getTheme());
        recordDO.setRecruitName(recruitStudentsDO.getName());
        recordDO.setRecruitStudentsId(recruitStudentsId);
        recruitStudentsRecordDao.save(recordDO);

svr/svr-cloud-care/src/main/resources/application.yml

@@ -439,8 +439,8 @@ hospital:
wechat:
  appId: wx2c55f5b7b2f3cb56
  appSecret: 0dd9927e58125ad5f0efb9299860d145
  wechat_token: 1
  wechat_base_url: http%3a%2f%2fweixin.xmtyw.cn%2fwlyy-dev
  wechat_token: 27eb3bb24f149a7760cf1bb154b08041
  wechat_base_url: http%3A%2F%2Fhzijk.cityihealth.com%2Fcityihealth%2FcloudCare%2F
  accId: gh_da06ed9e5751
  id: hz_yyyzh_wx  # base库中,wx_wechat 的id字段
  flag: true #演示环境  true走Mysql数据库  false走Oracle