Browse Source

添加redis外网访问

lwx_dev
erdanergou 3 years ago
parent
commit
b64144ddee
  1. 16
      src/main/java/com/dreamchaser/depository_manage/service/impl/MaterialServiceImpl.java
  2. 6
      src/main/resources/application-test.yml
  3. 3
      src/test/java/com/dreamchaser/depository_manage/OtherTest.java

16
src/main/java/com/dreamchaser/depository_manage/service/impl/MaterialServiceImpl.java

@ -305,6 +305,7 @@ public class MaterialServiceImpl implements MaterialService {
/**
* 用于修改库存中的备注
*
* @param map 待修改数据
* @return
*/
@ -987,7 +988,6 @@ public class MaterialServiceImpl implements MaterialService {
map.put("quantity", 0);
}
Map<String, Object> params = new HashMap<>();
// params.put("code", map.get("code"));
params.put("mid", map.get("mid"));
params.put("depositoryId", map.get("depositoryId"));
List<Inventory> inventory = materialMapper.findInventoryForImport(params);
@ -999,10 +999,12 @@ public class MaterialServiceImpl implements MaterialService {
Inventory material = inventory.get(0);
if (map.containsKey("remark")) {
material.setRemark(map.get("remark").toString());
String materialRemark = material.getRemark();
if (materialRemark == null) {
materialRemark = "";
}
material.setRemark(materialRemark + map.get("remark").toString());
}
double quantity = Double.parseDouble(map.get("quantity").toString());
double quantity_residue = 0;
int splitInfoScaleQuantity = 0;
@ -1108,8 +1110,7 @@ public class MaterialServiceImpl implements MaterialService {
}
}
return materialMapper.updateInventory(material);
}
else {
} else {
// 用于标志是新插入的物料
map.put("isNew", true);
Double quantity = ObjectFormatUtil.toDouble(map.get("quantity"));
@ -2722,8 +2723,7 @@ public class MaterialServiceImpl implements MaterialService {
map.put("id", material.getId());
result.add(map);
}
}
else if (inventoryList != null) {
} else if (inventoryList != null) {
for (Inventory inventory : inventoryList) {
Map<String, Object> map = new HashMap<>();
String version = inventory.getVersion();

6
src/main/resources/application-test.yml

@ -59,7 +59,8 @@ spring:
static-path-pattern: /static/**
redis:
port: 6379
host: 127.0.0.1
host: 36.133.126.182
# host: 127.0.0.1
database: 5
jedis:
pool:
@ -72,7 +73,8 @@ spring:
redisPool:
port: 6379
host: 127.0.0.1
# host: 127.0.0.1
host: 36.133.126.182
dbs: 5,14,15
password:

3
src/test/java/com/dreamchaser/depository_manage/OtherTest.java

@ -99,8 +99,7 @@ public class OtherTest {
@Test
public void someTest(){
String local = "HXGK_GO_ZhixingCollege:ScanCode:Authentication:LoginApi_dev_e3bfa398fe9d0e1ab78a00ff59eff788";
Object usertoken = redisPool.getRedisTemplateByDb(5).opsForHash().get(local, "usertoken");
Object usertoken = redisPool.getRedisTemplateByDb(5).opsForHash().get("HXGK_GO_ZhixingCollege:ScanCode:Authentication:LoginApi_dev_e3bfa398fe9d0e1ab78a00ff59eff788", "usertoken");
System.out.println(usertoken);
}

Loading…
Cancel
Save