修改了短信发送的路径配置 , 取消了定时发送对公核对 , 改为了实时发送
This commit is contained in:
1215525055@qq.com
parent
f77633d1e8
commit
f84a36c525
@ -107,7 +107,8 @@ public class PackageOrderResourceController extends DefaultBaseController {
|
||||
@ApiImplicitParam(name = "rows", value = "显示数量", paramType = "query", dataType = "int", defaultValue = "20"),
|
||||
@ApiImplicitParam(name = "keywords", value = "关键字", paramType = "query", dataType = "String"),
|
||||
@ApiImplicitParam(name = "startTime", value = "开始时间", paramType = "query", dataType = "String"),
|
||||
@ApiImplicitParam(name = "endTime", value = "结束时间", paramType = "query", dataType = "String")
|
||||
@ApiImplicitParam(name = "endTime", value = "结束时间", paramType = "query", dataType = "String"),
|
||||
@ApiImplicitParam(name = "keYong", value = "剩余次数>0的", paramType = "query", dataType = "String")
|
||||
})
|
||||
@ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)})
|
||||
@GetMapping("listpage/{userId}")
|
||||
|
||||
@ -17,6 +17,15 @@ public class SystemApiPathProperties extends ApiPathProperties {
|
||||
|
||||
private String copyright;
|
||||
private String copyrightExternal;
|
||||
private String operatorPlugin;
|
||||
|
||||
public String getOperatorPlugin() {
|
||||
return operatorPlugin == null ? "" : operatorPlugin.trim();
|
||||
}
|
||||
|
||||
public void setOperatorPlugin(String operatorPlugin) {
|
||||
this.operatorPlugin = operatorPlugin;
|
||||
}
|
||||
|
||||
public String getCopyright() {
|
||||
return copyright == null ? "" : copyright.trim();
|
||||
|
||||
@ -0,0 +1,44 @@
|
||||
package cn.com.tenlion.operator.util;
|
||||
|
||||
import org.springframework.beans.BeansException;
|
||||
import org.springframework.context.ApplicationContext;
|
||||
import org.springframework.context.ApplicationContextAware;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
@Component
|
||||
public class OperatorSpringUtil implements ApplicationContextAware {
|
||||
|
||||
private static ApplicationContext applicationContext;
|
||||
|
||||
@Override
|
||||
public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
|
||||
if(OperatorSpringUtil.applicationContext == null) {
|
||||
OperatorSpringUtil.applicationContext = applicationContext;
|
||||
}
|
||||
System.out.println("---------------------------------------------------------------------");
|
||||
System.out.println("--------------------------OperatorSpringUtil------------------------");
|
||||
System.out.println("========ApplicationContext配置成功,在普通类可以通过调用SpringUtils.getAppContext()获取applicationContext对象,applicationContext="+OperatorSpringUtil.applicationContext+"========");
|
||||
System.out.println("---------------------------------------------------------------------");
|
||||
}
|
||||
|
||||
//获取applicationContext
|
||||
public static ApplicationContext getApplicationContext() {
|
||||
return applicationContext;
|
||||
}
|
||||
|
||||
//通过name获取 Bean.
|
||||
public static Object getBean(String name){
|
||||
return getApplicationContext().getBean(name);
|
||||
}
|
||||
|
||||
//通过class获取Bean.
|
||||
public static <T> T getBean(Class<T> clazz){
|
||||
return getApplicationContext().getBean(clazz);
|
||||
}
|
||||
|
||||
//通过name,以及Clazz返回指定的Bean
|
||||
public static <T> T getBean(String name,Class<T> clazz){
|
||||
return getApplicationContext().getBean(name, clazz);
|
||||
}
|
||||
|
||||
}
|
||||
@ -1,5 +1,6 @@
|
||||
package cn.com.tenlion.operator.util;
|
||||
|
||||
import cn.com.tenlion.operator.properties.SystemApiPathProperties;
|
||||
import com.alibaba.fastjson.JSON;
|
||||
import com.alibaba.fastjson.JSONArray;
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
@ -35,7 +36,14 @@ public class TenlionSMS {
|
||||
private static String getReplySMSUrl = systemUrl + "/app/send/reply";
|
||||
// 账号可用模板列表查询
|
||||
private static String getTemplateSMSUrl = systemUrl + "/app/send/template";
|
||||
|
||||
|
||||
static{
|
||||
SystemApiPathProperties apiPathProperties = OperatorSpringUtil.getBean(SystemApiPathProperties.class);
|
||||
systemUrl = apiPathProperties.getOperatorPlugin();
|
||||
if (systemUrl.endsWith("/")) {
|
||||
systemUrl = systemUrl.substring(0, systemUrl.length() -1);
|
||||
}
|
||||
}
|
||||
public static void main(String[] args) {
|
||||
// 可用模板列表
|
||||
// System.out.println(getTemplate());
|
||||
|
||||
@ -237,6 +237,7 @@ api-path:
|
||||
user-center: http://192.168.0.115:8091/operator/
|
||||
copyright: http://192.168.0.15:7025/copyright/
|
||||
copyright-external: http://192.168.0.103:7025/copyright/
|
||||
operator-plugin: http://192.168.0.115:8099/operator-plugin/
|
||||
|
||||
# 短信验证码服务
|
||||
sms:
|
||||
|
||||
@ -300,6 +300,9 @@
|
||||
t1.package_info_id = t4.package_info_id
|
||||
WHERE
|
||||
t1.is_delete = 0
|
||||
<if test="keYong != null and keYong != ''">
|
||||
AND t1.package_total_surplus_count > 0
|
||||
</if>
|
||||
<if test="packagePayStatus != null and packagePayStatus != ''">
|
||||
AND t1.package_pay_status = #{packagePayStatus}
|
||||
</if>
|
||||
|
||||
@ -111,7 +111,7 @@
|
||||
<div class="layui-form-item layui-form-text">
|
||||
<label class="layui-form-label"><button type="button" class="layui-btn layui-btn-sm selectUserAPI" style="margin-top: -5px;margin-left: -12px;" >选择优惠券定向发放用户群</button></label>
|
||||
<div class="layui-input-block">
|
||||
<textarea name="phone" disabled style="height:150px;" id="phone" required lay-verify="required" placeholder="不选择用户则所有用户都可领取" class="layui-textarea"></textarea>
|
||||
<textarea name="phone" disabled style="height:150px;" id="phone" placeholder="不选择用户则所有用户都可领取" class="layui-textarea"></textarea>
|
||||
</div>
|
||||
</div>
|
||||
<div class="layui-form-item layui-layout-admin">
|
||||
|
||||
@ -110,7 +110,7 @@
|
||||
<div class="layui-form-item layui-form-text">
|
||||
<label class="layui-form-label"><button type="button" class="layui-btn layui-btn-sm selectUserAPI" style="margin-top: -5px;margin-left: -12px;" >选择优惠券定向发放用户群</button></label>
|
||||
<div class="layui-input-block">
|
||||
<textarea name="phone" disabled style="height:150px;" id="phone" required lay-verify="required" placeholder="不选择用户则所有用户都可领取" class="layui-textarea"></textarea>
|
||||
<textarea name="phone" disabled style="height:150px;" id="phone" placeholder="不选择用户则所有用户都可领取" class="layui-textarea"></textarea>
|
||||
</div>
|
||||
</div>
|
||||
<div class="layui-form-item layui-layout-admin">
|
||||
|
||||
Loading…
Reference in New Issue
Block a user