20191128 合并分支

server/src/main/java/com/pica/cloud/account/account/server/starter/JobExecutorConfiguration.java

-package com.pica.cloud.account.account.server.starter;
-
-import com.xxl.job.core.executor.impl.XxlJobSpringExecutor;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * Created on 2019/11/6 15:39
- * author:crs
- * Description:配置式job
- */
-@Configuration
-public class JobExecutorConfiguration {
-
-    private Logger logger = LoggerFactory.getLogger(JobExecutorConfiguration.class);
-
-    @Value("${xxl.job.admin.addresses}")
-    private String adminAddresses;
-
-    @Value("${xxl.job.executor.appname}")
-    private String appName;
-
-    @Value("${xxl.job.executor.ip}")
-    private String ip;
-
-    @Value("${xxl.job.executor.port}")
-    private int port;
-
-    @Value("${xxl.job.accessToken}")
-    private String accessToken;
-
-    @Value("${xxl.job.executor.logpath}")
-    private String logPath;
-
-    @Value("${xxl.job.executor.logretentiondays}")
-    private int logRetentionDays;
-
-    @Bean(initMethod = "start", destroyMethod = "destroy")
-    public XxlJobSpringExecutor xxlJobExecutor() {
-        logger.info("pica-job config init.");
-        XxlJobSpringExecutor xxlJobSpringExecutor = new XxlJobSpringExecutor();
-        xxlJobSpringExecutor.setAdminAddresses(adminAddresses);
-        xxlJobSpringExecutor.setAppName(appName);
-        xxlJobSpringExecutor.setIp(ip);
-        xxlJobSpringExecutor.setPort(port);
-        xxlJobSpringExecutor.setAccessToken(accessToken);
-        xxlJobSpringExecutor.setLogPath(logPath);
-        xxlJobSpringExecutor.setLogRetentionDays(logRetentionDays);
-
-        return xxlJobSpringExecutor;
-    }
-
-
-}
-

server/src/main/java/com/pica/cloud/account/account/server/util/AESUtil.java

@@ -168,11 +168,8 @@ public class AESUtil {
     public static void main(String[] args) throws Exception {
         String KEY="zJJ$c5md3$yuuhWW";
         System.out.println("-------------加密---------");
-<<<<<<< HEAD
         String content = "13671795786";
-=======
-        String content = "13916000001";
->>>>>>> dev-sensitive-20191112
+
         System.out.println("加密前：" + content);
         System.out.println("加密密钥和解密密钥：" + KEY);
 

server/src/main/resources/mybatis/AccountInfoEntityMapper.xml

@@ -67,11 +67,11 @@
       update account_info set modified_id=#{id}, modified_time=#{modifiedTime},mobile_phone=#{mobilePhone} where id=#{id} and delete_flag=1
   </update>
 
-    <update id="processAccountRepeatData">
-    update account_info set delete_flag=2, modified_id=101432928, modified_time=now() where id in (select id from (select pd.id from account_info pd
-    inner JOIN (SELECT mobile_phone,MIN(id) as id FROM account_info WHERE delete_flag=1 and mobile_phone is not null GROUP BY mobile_phone having count(*)>1) inn
-    on pd.id != inn.id and pd.mobile_phone = inn.mobile_phone) ttt);
-</update>
+    <!--<update id="processAccountRepeatData">-->
+    <!--update account_info set delete_flag=2, modified_id=101432928, modified_time=now() where id in (select id from (select pd.id from account_info pd-->
+    <!--inner JOIN (SELECT mobile_phone,MIN(id) as id FROM account_info WHERE delete_flag=1 and mobile_phone is not null GROUP BY mobile_phone having count(*)>1) inn-->
+    <!--on pd.id != inn.id and pd.mobile_phone = inn.mobile_phone) ttt);-->
+<!--</update>-->
 
     <!--修改用户的密码-->
     <update id="updatePasswordByPrimaryKey"