Commit 8d1cecdd authored by 张永's avatar 张永

升个版本号

parent 5d113dea
Pipeline #162 canceled with stages
...@@ -2,8 +2,8 @@ package com.egolm.shop.config; ...@@ -2,8 +2,8 @@ package com.egolm.shop.config;
import javax.sql.DataSource; import javax.sql.DataSource;
import org.springframework.boot.autoconfigure.jdbc.DataSourceBuilder;
import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.boot.jdbc.DataSourceBuilder;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Primary; import org.springframework.context.annotation.Primary;
......
...@@ -22,7 +22,6 @@ import io.swagger.annotations.Api; ...@@ -22,7 +22,6 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import redis.clients.jedis.JedisCommands;
@Api(tags={"搜索引擎商品相关接口"}) @Api(tags={"搜索引擎商品相关接口"})
@Controller @Controller
...@@ -92,7 +91,7 @@ public class SolrGoodsController { ...@@ -92,7 +91,7 @@ public class SolrGoodsController {
@PostMapping("getLock") @PostMapping("getLock")
@ApiOperation("设置搜索引擎更新索引定时任务分布式互斥锁") @ApiOperation("设置搜索引擎更新索引定时任务分布式互斥锁")
public Rjx getLock() { public Rjx getLock() {
String result = redisTemplate.execute(new RedisCallback<String>() { /*String result = redisTemplate.execute(new RedisCallback<String>() {
@Override @Override
public String doInRedis(RedisConnection connection) throws DataAccessException { public String doInRedis(RedisConnection connection) throws DataAccessException {
JedisCommands commands = (JedisCommands) connection.getNativeConnection(); JedisCommands commands = (JedisCommands) connection.getNativeConnection();
...@@ -104,7 +103,8 @@ public class SolrGoodsController { ...@@ -104,7 +103,8 @@ public class SolrGoodsController {
return Rjx.jsonOk(); return Rjx.jsonOk();
} else { } else {
return Rjx.jsonErr(); return Rjx.jsonErr();
} }*/
return Rjx.jsonOk().setMessage("这个注释掉了");
} }
@ResponseBody @ResponseBody
......
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