Merge remote-tracking branch 'origin/qiandao_v1.0' into qiandao_v1.0

# Conflicts:
#	ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/qiandao/SignInTaskServiceImpl.java
#	ch-wx-api/src/main/java/com/wwdz/ch/wx/service/qiandao/SignInTaskService.java
#	ch-wx-api/src/main/java/com/wwdz/ch/wx/web/qiandao/SignInTaskServiceController.java

.idea/.gitignore

+# Default ignored files
+/shelf/
+/workspace.xml
+# Editor-based HTTP Client requests
+/httpRequests/
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml

.idea/compiler.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <annotationProcessing>
+      <profile default="true" name="Default" enabled="true" />
+      <profile name="Maven default annotation processors profile" enabled="true">
+        <sourceOutputDir name="target/generated-sources/annotations" />
+        <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
+        <outputRelativeToContentRoot value="true" />
+        <module name="quanku-applet" />
+        <module name="quanku-system" />
+        <module name="ch-dao" />
+        <module name="ch-core" />
+      </profile>
+    </annotationProcessing>
+  </component>
+  <component name="JavacSettings">
+    <option name="ADDITIONAL_OPTIONS_OVERRIDE">
+      <module name="ch-core" options="-parameters" />
+      <module name="ch-dao" options="-parameters" />
+      <module name="quanku-applet" options="-parameters" />
+      <module name="quanku-system" options="-parameters" />
+    </option>
+  </component>
+</project>
\ No newline at end of file

.idea/encodings.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding">
+    <file url="file://$PROJECT_DIR$/ch-admin-api/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/ch-core/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/ch-dao/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/ch-wx-api/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/src/main/resources" charset="UTF-8" />
+  </component>
+</project>
\ No newline at end of file

.idea/jarRepositories.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RemoteRepositoriesConfiguration">
+    <remote-repository>
+      <option name="id" value="wwdz-snapshots" />
+      <option name="name" value="wwdz-snapshots" />
+      <option name="url" value="http://nexus.wanwudezhi.work/repository/wwdz-snapshots-group/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="central" />
+      <option name="url" value="http://nexus.wanwudezhi.work/repository/wwdz-public/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Central Repository" />
+      <option name="url" value="http://nexus.wanwudezhi.work/repository/wwdz-public/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Maven Central repository" />
+      <option name="url" value="https://repo1.maven.org/maven2" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="jboss.community" />
+      <option name="name" value="JBoss Community repository" />
+      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="wwdz-releases" />
+      <option name="name" value="wwdz-releases" />
+      <option name="url" value="http://nexus.wanwudezhi.work/repository/wwdz-releases-group/" />
+    </remote-repository>
+  </component>
+</project>
\ No newline at end of file

.idea/misc.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ExternalStorageConfigurationManager" enabled="true" />
+  <component name="MavenProjectsManager">
+    <option name="originalFiles">
+      <list>
+        <option value="$PROJECT_DIR$/pom.xml" />
+      </list>
+    </option>
+  </component>
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK" />
+</project>
\ No newline at end of file

.idea/vcs.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file

ch-dao/pom.xml

@@ -273,7 +273,12 @@
         <dependency>
             <groupId>org.apache.curator</groupId>
             <artifactId>curator-recipes</artifactId>
-            <version>2.13.0</version>
+            <version>2.12.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.curator</groupId>
+            <artifactId>curator-framework</artifactId>
+            <version>2.12.0</version>
         </dependency>
     </dependencies>
 

ch-wx-api/pom.xml

@@ -13,6 +13,16 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
     <dependencies>
+        <dependency>
+        <groupId>org.apache.curator</groupId>
+        <artifactId>curator-recipes</artifactId>
+        <version>2.12.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.curator</groupId>
+            <artifactId>curator-framework</artifactId>
+            <version>2.12.0</version>
+        </dependency>
 
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -35,6 +45,12 @@
             <groupId>com.wwdz</groupId>
             <artifactId>ch-dao</artifactId>
             <version>${project.version}</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>curator-framework</artifactId>
+                    <groupId>org.apache.curator</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>

ch-wx-api/src/main/resources/logback-spring.xml

@@ -7,7 +7,7 @@
     <property name="log.level.console" value="all"/>
     <property name="rolling.pattern" value="%d{yyyy-MM-dd}"/>
     <property name="layout.pattern" value="%-5p %d [%t] %c{50} > %m%n"/>
-    <property name="LOG_FILE_PATH" value="/data/logs/"/>
+<!--    <property name="LOG_FILE_PATH" value="/data/logs/"/>-->
     <property name="APP_NAME" value="quanku-applet"/>
 
     <appender name="console" class="ch.qos.logback.core.ConsoleAppender">