20191114 补全密码

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

+package com.pica.cloud.account.account.server.configuration;
+
+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/14 13:44
+ * author:crs
+ * Description:XXX
+ */
+@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/configuration/PropertiesConfiguration.java

 package com.pica.cloud.account.account.server.configuration;
 
-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.cloud.context.config.annotation.RefreshScope;
-import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
 @Configuration
-@RefreshScope
+//@RefreshScope
 public class PropertiesConfiguration {
     private Logger logger = LoggerFactory.getLogger(PropertiesConfiguration.class);
 
@@ -25,41 +22,4 @@ public class PropertiesConfiguration {
         this.messageUrl = messageUrl;
     }
 
-
-
-    @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/job/AccountRepeatDataJob.java

@@ -23,7 +23,7 @@ public class AccountRepeatDataJob extends IJobHandler {
     @Override
     public ReturnT<String> execute(String s) throws Exception {
         accountInfoDetailMapper.processAccountRepeatData();
-        XxlJobLogger.log("刷新数据");
+        XxlJobLogger.log("AccountRepeatDataJob");
         return SUCCESS;
     }
 }

server/src/main/java/com/pica/cloud/account/account/server/service/impl/RegisterServiceImpl.java

@@ -126,6 +126,7 @@ public class RegisterServiceImpl implements RegisterService {
                         account.setFirstLoginTime(currentTime);
                         account.setLastLoginTime(currentTime);
                         account.setPassword(password);
+                        account.setEntireFlag(3);
                         accountMapper.insertSelective(account);
                     }
                     Long userId = accountUtils.getUserIdByAcctId(productType, acctId);

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

@@ -168,7 +168,7 @@ public class AESUtil {
     public static void main(String[] args) throws Exception {
         String KEY="zJJ$c5md3$yuuhWW";
         System.out.println("-------------加密---------");
-        String content = "15607244444";
+        String content = "13893035796";
         System.out.println("加密前：" + content);
         System.out.println("加密密钥和解密密钥：" + KEY);
 

server/src/main/resources/bootstrap-uat.properties

@@ -54,7 +54,6 @@ spring.rabbitmq.virtual-host=account-register-vhost
 # Job config begin
 # 控制器地址：服务启动自动注册到控制器中
 xxl.job.admin.addresses=http://192.168.110.141:7899/job
-
 #执行器命名规则job-exec-<申请Port>
 xxl.job.executor.appname=job-exec-7906
 xxl.job.executor.ip=