Merge remote-tracking branch 'origin/master'

zhs

9 小时以前 66a52b9c8b6d0668ff3d7c431e9e17f2c365e3e6

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/tools/BaseSmsaccountController.java

@@ -40,9 +40,6 @@
    @Autowired
    private IBaseSmsaccountService baseSmsaccountService;

    @Value("${visitHosp}")
    private Integer visitHosp;

    @Value("${xhsmsPath}")
    private String xhsmsPath;

@@ -51,6 +48,9 @@

    @Value("${xhsmsPwd}")
    private String xhsmsPwd;

    @Value("${spring.profiles.active}")
    private String active;

    /**
     * 查询短信账号列表
@@ -123,7 +123,7 @@
    @RepeatSubmit
    public AjaxResult sendMsg(@RequestBody BaseSmsRequest baseSmsRequest) {
        String sendMsg="";
        if(visitHosp.equals("3")) {
        if (active.equals("hzszlyy")) {
            try{
                JSONObject jsTemp = JSON.parseObject(baseSmsRequest.getTemplateParam());
                String content=jsTemp.getString("name");