From ef04ce57881e6a338b10d596c5eb76b2220598bf Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 31 八月 2023 11:16:49 +0800
Subject: [PATCH] 更新版本

---
 user/guns-admin/pom.xml                                                                            |    2 
 user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/util/weChat/WeChatUtil.java |   32 ++++++++--------
 user/guns-admin/src/main/resources/redis.properties                                                |    8 ++--
 user/guns-admin/src/main/resources/application.yml                                                 |   28 ++++++-------
 4 files changed, 34 insertions(+), 36 deletions(-)

diff --git a/user/guns-admin/pom.xml b/user/guns-admin/pom.xml
index 4d63379..6429635 100644
--- a/user/guns-admin/pom.xml
+++ b/user/guns-admin/pom.xml
@@ -9,7 +9,7 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <artifactId>guns-admin</artifactId>
+    <artifactId>user</artifactId>
     <name>guns-admin</name>
     <description>guns 的spring boot版本</description>
 
diff --git a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/util/weChat/WeChatUtil.java b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/util/weChat/WeChatUtil.java
index 90e657d..0d6ec69 100644
--- a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/util/weChat/WeChatUtil.java
+++ b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/util/weChat/WeChatUtil.java
@@ -65,22 +65,22 @@
             @Override
             public void run() {
                 try {
-//                    Thread.sleep(30000);
-//                    new Timer().schedule(new TimerTask() {
-//                        @Override
-//                        public void run() {
-//                            try {
-//                                String wxAppletsAccessToken = getWxAppletsAccessToken();
-//                                if(ToolUtil.isEmpty(wxAppletsAccessToken)){
-//                                    System.err.println("获取微信小程序access_token失败");
-//                                    return;
-//                                }
-//                                redisUtil.setStrValue("wxAppletsAccessToken", wxAppletsAccessToken, 7000);
-//                            }catch (Exception e){
-//                                e.printStackTrace();
-//                            }
-//                        }
-//                    }, 0, 6000000);
+                    Thread.sleep(30000);
+                    new Timer().schedule(new TimerTask() {
+                        @Override
+                        public void run() {
+                            try {
+                                String wxAppletsAccessToken = getWxAppletsAccessToken();
+                                if(ToolUtil.isEmpty(wxAppletsAccessToken)){
+                                    System.err.println("获取微信小程序access_token失败");
+                                    return;
+                                }
+                                redisUtil.setStrValue("wxAppletsAccessToken", wxAppletsAccessToken, 7000);
+                            }catch (Exception e){
+                                e.printStackTrace();
+                            }
+                        }
+                    }, 0, 6000000);
                 }catch (Exception e){
                     e.printStackTrace();
                 }
diff --git a/user/guns-admin/src/main/resources/application.yml b/user/guns-admin/src/main/resources/application.yml
index 349b2fd..8a09a36 100644
--- a/user/guns-admin/src/main/resources/application.yml
+++ b/user/guns-admin/src/main/resources/application.yml
@@ -13,8 +13,8 @@
   application:
     name: user-server
   profiles:
-    active: dev
-#    active: produce
+#    active: dev
+    active: produce
   mvc:
     static-path-pattern: /static/**
     view:
@@ -44,7 +44,7 @@
 eureka:
   client:
     service-url: #注册中心地址
-      defaultZone: http://sinata:sinata@192.168.110.22:8000/eureka #启用身份验证的方式连接
+      defaultZone: http://sinata:sinata@127.0.0.1:8000/eureka #启用身份验证的方式连接
     register-with-eureka: true #在注册中心进行注册
     fetch-registry: true #从Eureka中获取注册信息。
 
@@ -52,20 +52,18 @@
 
 
 spring:
-#  datasource:
-#    url: jdbc:mysql://127.0.0.1:3306/super_save_driving?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai
-#    username: root
-#    password: f4OfRjqoN3jSiNGiUoiNsQdOBtCOKYRj
-##    password: 123456
-#    db-name: guns #用来搜集数据库的所有表
-#    filters: wall,mergeStat
   datasource:
-    url: jdbc:mysql://192.168.110.80:3306/super_save_driving?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://127.0.0.1:3306/super_save_driving?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai
     username: root
-    password: 123456
-    #    password: 123456
+    password: f4OfRjqoN3jSiNGiUoiNsQdOBtCOKYRj
     db-name: guns #用来搜集数据库的所有表
     filters: wall,mergeStat
+#  datasource:
+#    url: jdbc:mysql://192.168.110.80:3306/super_save_driving?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai
+#    username: root
+#    password: 123456
+#    db-name: guns #用来搜集数据库的所有表
+#    filters: wall,mergeStat
 
 
 #多数据源情况的配置
@@ -138,8 +136,8 @@
 spring:
   data:
     mongodb:
-#      uri: mongodb://root:CEtyLdKjPk0yeHNo@127.0.0.1:27017/admin
-      uri: mongodb://127.0.0.1:27017/admin
+      uri: mongodb://root:CEtyLdKjPk0yeHNo@127.0.0.1:27017/admin
+#      uri: mongodb://127.0.0.1:27017/admin
 
 
 #  mallbook 调起接口参数配置
diff --git a/user/guns-admin/src/main/resources/redis.properties b/user/guns-admin/src/main/resources/redis.properties
index b51a9f8..726be87 100644
--- a/user/guns-admin/src/main/resources/redis.properties
+++ b/user/guns-admin/src/main/resources/redis.properties
@@ -5,16 +5,16 @@
 # Redis��������ַ
 spring.redis.host=127.0.0.1
 # Redis���������Ӷ˿�
-#spring.redis.port=16379
+spring.redis.port=16379
 # Redis�������������루Ĭ��Ϊ�գ�
-#spring.redis.password=cKsEeyffDXG5PzNg8CIbrWxFluXrCprZ
+spring.redis.password=cKsEeyffDXG5PzNg8CIbrWxFluXrCprZ
 
 ## Redis��������ַ
 #spring.redis.host=127.0.0.1
 ## Redis���������Ӷ˿�
-spring.redis.port=6379
+#spring.redis.port=6379
 ## Redis�������������루Ĭ��Ϊ�գ�
-spring.redis.password=123456
+#spring.redis.password=123456
 
 # ���ӳ������������ʹ�ø�ֵ��ʾû�����ƣ�
 spring.redis.jedis.pool.max-active=1024

--
Gitblit v1.7.1