Merge remote-tracking branch 'origin/master'

dq-financial-crms-auth/src/main/resources/bootstrap.properties

@@ -1,6 +1,6 @@
 
 #<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-spring.application.name=dq-financial-crms-auth
+spring.application.name=dq-financial-crms
 #<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ĵ<EFBFBD>ַ
 spring.cloud.nacos.config.server-addr=192.168.31.142:8848
 spring.cloud.nacos.config.namespace=37d72d30-3178-4173-8b5e-269a23355ed9
@@ -16,4 +16,22 @@ spring.cloud.nacos.config.ext-config[1].refresh=true
 
 spring.cloud.nacos.config.ext-config[2].data-id=other.yml
 spring.cloud.nacos.config.ext-config[2].group=dev
-spring.cloud.nacos.config.ext-config[2].refresh=true
+spring.cloud.nacos.config.ext-config[2].refresh=true
+
+# 开发和测试环境（prod）
+#spring.application.name=dq-financial-crms
+#spring.cloud.nacos.config.server-addr=120.78.127.12:8848
+#spring.cloud.nacos.config.namespace=204f5ba8-12e0-46b3-b7ea-5c8e4a966640
+##spring.cloud.nacos.config.group=prod
+#
+#spring.cloud.nacos.config.ext-config[0].data-id=datasource.yml
+#spring.cloud.nacos.config.ext-config[0].group=prod
+#spring.cloud.nacos.config.ext-config[0].refresh=true
+#
+#spring.cloud.nacos.config.ext-config[1].data-id=mybatis.yml
+#spring.cloud.nacos.config.ext-config[1].group=prod
+#spring.cloud.nacos.config.ext-config[1].refresh=true
+#
+#spring.cloud.nacos.config.ext-config[2].data-id=other.yml
+#spring.cloud.nacos.config.ext-config[2].group=prod
+#spring.cloud.nacos.config.ext-config[2].refresh=true

dq-financial-crms/src/main/resources/bootstrap.properties

@@ -1,3 +1,4 @@
+# 开发和测试环境（dev）
 #服务名称
 spring.application.name=dq-financial-crms
 #配置中心地址
@@ -15,4 +16,24 @@ spring.cloud.nacos.config.ext-config[1].refresh=true
 
 spring.cloud.nacos.config.ext-config[2].data-id=other.yml
 spring.cloud.nacos.config.ext-config[2].group=dev
-spring.cloud.nacos.config.ext-config[2].refresh=true
+spring.cloud.nacos.config.ext-config[2].refresh=true
+
+# 正式环境（prod）
+#服务名称
+#spring.application.name=dq-financial-crms
+##配置中心地址
+#spring.cloud.nacos.config.server-addr=120.78.127.12:8848
+#spring.cloud.nacos.config.namespace=25ce05e2-a0eb-4842-92e4-d8b550a489dd
+##spring.cloud.nacos.config.group=prod
+#
+#spring.cloud.nacos.config.ext-config[0].data-id=datasource.yml
+#spring.cloud.nacos.config.ext-config[0].group=prod
+#spring.cloud.nacos.config.ext-config[0].refresh=true
+#
+#spring.cloud.nacos.config.ext-config[1].data-id=mybatis.yml
+#spring.cloud.nacos.config.ext-config[1].group=prod
+#spring.cloud.nacos.config.ext-config[1].refresh=true
+#
+#spring.cloud.nacos.config.ext-config[2].data-id=other.yml
+#spring.cloud.nacos.config.ext-config[2].group=prod
+#spring.cloud.nacos.config.ext-config[2].refresh=true

dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/service/impl/UserLoginServiceImpl.java

@@ -133,7 +133,7 @@ public class UserLoginServiceImpl extends ServiceImpl<UserLoginDao, UserEntity>
         Token userToken = tokenService.getOne(new QueryWrapper<Token>().eq("user_id", userEntity.getId()));
         if(userToken != null){
             //删除redis里面的token
-            JwtUtils.removeTokenByToken(userToken.getToken());
+            //JwtUtils.removeTokenByToken(userToken.getToken());
             //数据库重置token
             userToken.setToken(token);
             userToken.setCreateTime(new Date());

dq-financial-hrms-auth/src/main/resources/bootstrap.properties

@@ -1,7 +1,6 @@
-
-#<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+# 开发和测试环境（dev）
 spring.application.name=dq-financial-hrms-auth
-#<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ĵ<EFBFBD>ַ
+
 spring.cloud.nacos.config.server-addr=192.168.31.142:8848
 spring.cloud.nacos.config.namespace=7632bdaa-3381-4669-b3f9-2fc73be451e8
 #spring.cloud.nacos.config.group=prod
@@ -27,3 +26,33 @@ spring.redis.jedis.pool.max-active=8
 spring.redis.jedis.pool.max-wait=-1
 spring.redis.jedis.pool.max-idle=8
 spring.redis.jedis.pool.min-idle=0
+
+
+# 正式环境（prod）
+#spring.application.name=dq-financial-hrms-auth
+#
+#spring.cloud.nacos.config.server-addr=120.78.127.12:8848
+#spring.cloud.nacos.config.namespace=b590c830-7ada-44b7-968f-e8d0c81990c4
+##spring.cloud.nacos.config.group=prod
+#
+#spring.cloud.nacos.config.ext-config[0].data-id=datasource.yml
+#spring.cloud.nacos.config.ext-config[0].group=prod
+#spring.cloud.nacos.config.ext-config[0].refresh=true
+#
+#spring.cloud.nacos.config.ext-config[1].data-id=mybatis.yml
+#spring.cloud.nacos.config.ext-config[1].group=prod
+#spring.cloud.nacos.config.ext-config[1].refresh=true
+#
+#spring.cloud.nacos.config.ext-config[2].data-id=other.yml
+#spring.cloud.nacos.config.ext-config[2].group=prod
+#spring.cloud.nacos.config.ext-config[2].refresh=true
+#
+#spring.redis.host=127.0.0.1
+#spring.redis.port=6379
+#spring.redis.password=dq123456
+#spring.redis.database=0
+#spring.redis.timeout=30000
+#spring.redis.jedis.pool.max-active=8
+#spring.redis.jedis.pool.max-wait=-1
+#spring.redis.jedis.pool.max-idle=8
+#spring.redis.jedis.pool.min-idle=0

dq-financial-hrms/src/main/resources/bootstrap.properties

@@ -25,4 +25,34 @@ spring.redis.timeout=30000
 spring.redis.jedis.pool.max-active=8
 spring.redis.jedis.pool.max-wait=-1
 spring.redis.jedis.pool.max-idle=8
-spring.redis.jedis.pool.min-idle=0
+spring.redis.jedis.pool.min-idle=0
+
+# 正式环境（prod）
+#服务名称
+#spring.application.name=dq-financial-hrms
+##配置中心地址
+#spring.cloud.nacos.config.server-addr=120.78.127.12:8848
+#spring.cloud.nacos.config.namespace=69614b55-1521-421c-ac58-dbe4a5b01b43
+##spring.cloud.nacos.config.group=prod
+#
+#spring.cloud.nacos.config.ext-config[0].data-id=datasource.yml
+#spring.cloud.nacos.config.ext-config[0].group=prod
+#spring.cloud.nacos.config.ext-config[0].refresh=true
+#
+#spring.cloud.nacos.config.ext-config[1].data-id=mybatis.yml
+#spring.cloud.nacos.config.ext-config[1].group=prod
+#spring.cloud.nacos.config.ext-config[1].refresh=true
+#
+#spring.cloud.nacos.config.ext-config[2].data-id=other.yml
+#spring.cloud.nacos.config.ext-config[2].group=prod
+#spring.cloud.nacos.config.ext-config[2].refresh=true
+
+#spring.redis.host=127.0.0.1
+#spring.redis.port=6379
+#spring.redis.password=dq123456
+#spring.redis.database=0
+#spring.redis.timeout=30000
+#spring.redis.jedis.pool.max-active=8
+#spring.redis.jedis.pool.max-wait=-1
+#spring.redis.jedis.pool.max-idle=8
+#spring.redis.jedis.pool.min-idle=0

dq-framework-common/src/main/java/com/daqing/framework/util/Md5Util.java

@@ -22,6 +22,9 @@ public class Md5Util {
     }
 
     public static void main(String[] args) throws UnsupportedEncodingException {
+        System.out.printf(md5("1234562"));
+        /*String s = URLEncoder.encode("www.occupationlab.com", "utf-8");
+        System.out.println(s);*/
         //System.out.printf(md5("1234561"));
         String s = URLEncoder.encode("www.occupationlab.com", "utf-8");
         System.out.println(s);

dq-govern-gateway/src/main/resources/bootstrap.properties

@@ -16,4 +16,26 @@ spring.redis.timeout=30000
 spring.redis.jedis.pool.max-active=8
 spring.redis.jedis.pool.max-wait=-1
 spring.redis.jedis.pool.max-idle=8
-spring.redis.jedis.pool.min-idle=0
+spring.redis.jedis.pool.min-idle=0
+
+
+# 正式环境（prod）
+#服务名称
+#spring.application.name=dq-govern-gateway
+##配置中心地址
+#spring.cloud.nacos.config.server-addr=120.78.127.12:8848
+#spring.cloud.nacos.config.namespace=68738215-903f-426c-8658-2dcd99b20009
+#
+#spring.cloud.nacos.config.ext-config[0].data-id=dq-govern-gateway.yml
+#spring.cloud.nacos.config.ext-config[0].group=prod
+#spring.cloud.nacos.config.ext-config[0].refresh=true
+
+#spring.redis.host=127.0.0.1
+#spring.redis.port=6379
+#spring.redis.password=dq123456
+#spring.redis.database=0
+#spring.redis.timeout=30000
+#spring.redis.jedis.pool.max-active=8
+#spring.redis.jedis.pool.max-wait=-1
+#spring.redis.jedis.pool.max-idle=8
+#spring.redis.jedis.pool.min-idle=0