杰生

hx-service/crm/src/main/resources/application-dev.yml

@@ -12,4 +12,3 @@ spring:
 
     druid:
       time-between-eviction-runs-millis: 30000000
-      test-while-idle: false

hx-service/dev-ops/src/main/resources/application-dev.yml

@@ -12,4 +12,3 @@ spring:
 
     druid:
       time-between-eviction-runs-millis: 30000000
-      test-while-idle: false

hx-service/storage-restructure/pom.xml

@@ -48,10 +48,10 @@
             <artifactId>common-websocket</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-amqp</artifactId>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>org.springframework.boot</groupId>-->
+<!--            <artifactId>spring-boot-starter-amqp</artifactId>-->
+<!--        </dependency>-->
 
     </dependencies>
 

hx-service/storage-restructure/src/main/resources/application-dev.yml

@@ -12,4 +12,3 @@ spring:
 
     druid:
       time-between-eviction-runs-millis: 30000000
-      test-while-idle: false

hx-service/storage/src/main/java/com/fjhx/stock/service/impl/StockBackServiceImpl.java

@@ -379,7 +379,7 @@ public class StockBackServiceImpl extends ServiceImpl<StockBackMapper, StockBack
 
         QueryWrapper<Object> wrapper = Wrappers.query()
                 .eq("uu.IsDelete", 0)
-                .in("uu.DepartmentID", "A007", "A008", "A012")
+                .in("uu.DepartmentID", "A007", "A008", "A012","A017")
                 .isNotNull("uu.JobNo");
 
         return baseMapper.userStatistics(wrapper);

hx-service/weixin/src/main/java/com/fjhx/controller/TestController.java

@@ -5,6 +5,8 @@ import com.fjhx.constants.WeChatConstants;
 import com.fjhx.utils.aes.AesException;
 import com.fjhx.utils.aes.WXBizMsgCrypt;
 import lombok.extern.slf4j.Slf4j;
+import org.springblade.core.redis.cache.BladeRedis;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -31,6 +33,9 @@ import java.io.StringReader;
 @RequestMapping("/callback")
 public class TestController {
 
+    @Autowired
+    private BladeRedis bladeRedis;
+
 
     @GetMapping(value = "/test")
     public String test() {

hx-service/weixin/src/main/resources/application-dev.yml

@@ -12,4 +12,3 @@ spring:
 
     druid:
       time-between-eviction-runs-millis: 30000000
-      test-while-idle: false