hcst_sunzhen 4 лет назад
Родитель
Сommit
bc72b9b65e

+ 37 - 5
pom.xml

@@ -192,11 +192,11 @@
             <artifactId>xxl-rpc-core</artifactId>
             <version>1.5.0</version>
         </dependency>
-<!--        <dependency>-->
-<!--            <groupId>cn.com.ctop</groupId>-->
-<!--            <artifactId>xxl-job-core</artifactId>-->
-<!--            <version>2.0.2</version>-->
-<!--        </dependency>-->
+        <dependency>
+            <groupId>cn.com.ctop</groupId>
+            <artifactId>xxl-job-core</artifactId>
+            <version>2.0.2</version>
+        </dependency>
         <dependency>
             <groupId>com.xuxueli</groupId>
             <artifactId>xxl-mq-client</artifactId>
@@ -238,6 +238,38 @@
         </resources>
     </build>
 
+    <repositories>
+        <repository>
+            <id>bintray-americanexpress-maven</id>
+            <url>https://dl.bintray.com/americanexpress/maven</url>
+        </repository>
+        <repository>
+            <id>aliyun</id>
+            <name>aliyun Repository</name>
+            <url>http://maven.aliyun.com/nexus/content/groups/public</url>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </repository>
+        <repository>
+            <id>jeecg</id>
+            <name>jeecg Repository</name>
+            <url>http://maven.jeecg.org/nexus/content/repositories/jeecg</url>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </repository>
+
+        <repository>
+            <id>maven-3rdparty</id>
+            <url>https://packages.atlassian.com/maven-3rdparty/</url>
+        </repository>
+
+        <repository>
+            <id>ctop</id>
+            <url>http://39.106.184.70:8081/repository/3rd_part</url>
+        </repository>
+    </repositories>
 
 <!--    <profiles>-->
 <!--        <profile>-->

+ 2 - 0
src/main/java/cn/com/ctop/okr/job/handler/WxDepartAndUserInfoJob.java

@@ -5,7 +5,9 @@ import com.xxl.job.core.biz.model.ReturnT;
 import com.xxl.job.core.handler.annotation.XxlJob;
 import com.xxl.job.core.log.XxlJobLogger;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
 
+@Component
 public class WxDepartAndUserInfoJob {
     @Autowired
     private QYWxService qyWxService;

+ 2 - 0
src/main/java/cn/com/ctop/okr/service/impl/OkrServiceImpl.java

@@ -330,6 +330,8 @@ public class OkrServiceImpl implements OkrService {
 
         map.put("isCurrentQuarter",isCurrentQuarter);
         map.put("list",mapList);
+        map.put("year",todayYear);
+        map.put("quarter",todayQuarter);
 
         return map;
     }