diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppProductSafeMapper.xml b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppProductSafeMapper.xml
index 1b19fa1..002dfb9 100644
--- a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppProductSafeMapper.xml
+++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppProductSafeMapper.xml
@@ -7,14 +7,14 @@
         FROM (
             SELECT  *
                 FROM app_product_safe
-                where signTime BETWEEN CONCAT(CURDATE(),' 00:00:00') AND CONCAT(CURDATE(),' 23:59:59')
-                limit 1
         ) aps
         JOIN (
             SELECT name
             FROM app_user
             WHERE openId=#{openId} AND STATUS="1"
         )au ON  au.name=aps.signName
+        where signTime BETWEEN CONCAT(CURDATE(),' 00:00:00') AND CONCAT(CURDATE(),' 23:59:59')
+        limit 1
     </select>
 
 

diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppProductSafeMapper.xml b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppProductSafeMapper.xml
index 1b19fa1..002dfb9 100644
--- a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppProductSafeMapper.xml
+++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppProductSafeMapper.xml
@@ -7,14 +7,14 @@
         FROM (
             SELECT  *
                 FROM app_product_safe
-                where signTime BETWEEN CONCAT(CURDATE(),' 00:00:00') AND CONCAT(CURDATE(),' 23:59:59')
-                limit 1
         ) aps
         JOIN (
             SELECT name
             FROM app_user
             WHERE openId=#{openId} AND STATUS="1"
         )au ON  au.name=aps.signName
+        where signTime BETWEEN CONCAT(CURDATE(),' 00:00:00') AND CONCAT(CURDATE(),' 23:59:59')
+        limit 1
     </select>
 
 
diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppUserServiceImpl.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppUserServiceImpl.java
index c98688a..3946a90 100644
--- a/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppUserServiceImpl.java
+++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppUserServiceImpl.java
@@ -33,7 +33,6 @@
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.ibatis.annotations.Update;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
@@ -90,7 +89,7 @@
         List<AppUser> appUserList = this.baseMapper.selectPage(page, entityWrapper);
         Map<String, String> dictRoleMap = getDictRole(true);
         for (AppUser appUser : appUserList) {
-            appUser.setRole(dictRoleMap.containsKey(appUser.getRole()) ? dictRoleMap.get(appUser.getRole()) : null);
+//            appUser.setRole(dictRoleMap.containsKey(appUser.getRole()) ? dictRoleMap.get(appUser.getRole()) : null);
             appUser.setProjectNames(tranIdsToStrNames(appUser.getProjectIds()));
         }
         page.setRecords(appUserList);

diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppProductSafeMapper.xml b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppProductSafeMapper.xml
index 1b19fa1..002dfb9 100644
--- a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppProductSafeMapper.xml
+++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppProductSafeMapper.xml
@@ -7,14 +7,14 @@
         FROM (
             SELECT  *
                 FROM app_product_safe
-                where signTime BETWEEN CONCAT(CURDATE(),' 00:00:00') AND CONCAT(CURDATE(),' 23:59:59')
-                limit 1
         ) aps
         JOIN (
             SELECT name
             FROM app_user
             WHERE openId=#{openId} AND STATUS="1"
         )au ON  au.name=aps.signName
+        where signTime BETWEEN CONCAT(CURDATE(),' 00:00:00') AND CONCAT(CURDATE(),' 23:59:59')
+        limit 1
     </select>
 
 
diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppUserServiceImpl.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppUserServiceImpl.java
index c98688a..3946a90 100644
--- a/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppUserServiceImpl.java
+++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppUserServiceImpl.java
@@ -33,7 +33,6 @@
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.ibatis.annotations.Update;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
@@ -90,7 +89,7 @@
         List<AppUser> appUserList = this.baseMapper.selectPage(page, entityWrapper);
         Map<String, String> dictRoleMap = getDictRole(true);
         for (AppUser appUser : appUserList) {
-            appUser.setRole(dictRoleMap.containsKey(appUser.getRole()) ? dictRoleMap.get(appUser.getRole()) : null);
+//            appUser.setRole(dictRoleMap.containsKey(appUser.getRole()) ? dictRoleMap.get(appUser.getRole()) : null);
             appUser.setProjectNames(tranIdsToStrNames(appUser.getProjectIds()));
         }
         page.setRecords(appUserList);
diff --git a/casic-web/src/main/java/com/casic/missiles/CasicApplication.java b/casic-web/src/main/java/com/casic/missiles/CasicApplication.java
index 2e7e9a7..2d36cb3 100644
--- a/casic-web/src/main/java/com/casic/missiles/CasicApplication.java
+++ b/casic-web/src/main/java/com/casic/missiles/CasicApplication.java
@@ -1,7 +1,5 @@
 package com.casic.missiles;
 
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.annotations.TableId;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.boot.SpringApplication;

diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppProductSafeMapper.xml b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppProductSafeMapper.xml
index 1b19fa1..002dfb9 100644
--- a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppProductSafeMapper.xml
+++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppProductSafeMapper.xml
@@ -7,14 +7,14 @@
         FROM (
             SELECT  *
                 FROM app_product_safe
-                where signTime BETWEEN CONCAT(CURDATE(),' 00:00:00') AND CONCAT(CURDATE(),' 23:59:59')
-                limit 1
         ) aps
         JOIN (
             SELECT name
             FROM app_user
             WHERE openId=#{openId} AND STATUS="1"
         )au ON  au.name=aps.signName
+        where signTime BETWEEN CONCAT(CURDATE(),' 00:00:00') AND CONCAT(CURDATE(),' 23:59:59')
+        limit 1
     </select>
 
 
diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppUserServiceImpl.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppUserServiceImpl.java
index c98688a..3946a90 100644
--- a/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppUserServiceImpl.java
+++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppUserServiceImpl.java
@@ -33,7 +33,6 @@
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.ibatis.annotations.Update;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
@@ -90,7 +89,7 @@
         List<AppUser> appUserList = this.baseMapper.selectPage(page, entityWrapper);
         Map<String, String> dictRoleMap = getDictRole(true);
         for (AppUser appUser : appUserList) {
-            appUser.setRole(dictRoleMap.containsKey(appUser.getRole()) ? dictRoleMap.get(appUser.getRole()) : null);
+//            appUser.setRole(dictRoleMap.containsKey(appUser.getRole()) ? dictRoleMap.get(appUser.getRole()) : null);
             appUser.setProjectNames(tranIdsToStrNames(appUser.getProjectIds()));
         }
         page.setRecords(appUserList);
diff --git a/casic-web/src/main/java/com/casic/missiles/CasicApplication.java b/casic-web/src/main/java/com/casic/missiles/CasicApplication.java
index 2e7e9a7..2d36cb3 100644
--- a/casic-web/src/main/java/com/casic/missiles/CasicApplication.java
+++ b/casic-web/src/main/java/com/casic/missiles/CasicApplication.java
@@ -1,7 +1,5 @@
 package com.casic.missiles;
 
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.annotations.TableId;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.boot.SpringApplication;
diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml
index b540b70..0b2a040 100644
--- a/casic-web/src/main/resources/config/application-dev.yml
+++ b/casic-web/src/main/resources/config/application-dev.yml
@@ -6,8 +6,8 @@
 spring:
  datasource:
     url: jdbc:mysql://139.198.18.188:3306/product_device?autoReconnect=true&useUnicode=true&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull&characterEncoding=GB2312
-    username: brroot
-    password: brroot#203
+    username: pcroot
+    password: pcroot#203
     initial-size: 2
     min-idle: 1
 #flowable数据源和多数据源配置
@@ -17,13 +17,12 @@
                 /app/user/login,/app/user/project,/product/safe/add,/product/safe/sign-status,/product/safe/update,/well/pre/listPage,/product/safe/today-detail
   file-upload-path:  D:\cz\203\workspace\product-device\casic-web\src\main\resources\static\
   file-download-path:  D:\cz\203\workspace\product-device\casic-web\src\main\resources\excel\
-
   producerName: producer
   repairName: repair
   wxUrl: https://api.weixin.qq.com/sns/jscode2session  #获取微信openid
   appid: wx8f4b331065a9ac2e #微信小程序开发appid
   secret: 6c22ca8bca0b239c0cb152f9230e9c52 #微信小程序开发密钥
-  photoPath: http://192.168.8.110:8083/static/ #导出照片位置存放目录
+  photoPath: https://logapi.smartlog.work/static/ #导出照片位置存放目录
   export-file-delete: 0 0 */1 * * ? #日志文件有效扫描时间（现为一天扫描一次）
   file-valid-days: -1  #日志文件有效天数
 logging:

diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppProductSafeMapper.xml b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppProductSafeMapper.xml
index 1b19fa1..002dfb9 100644
--- a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppProductSafeMapper.xml
+++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppProductSafeMapper.xml
@@ -7,14 +7,14 @@
         FROM (
             SELECT  *
                 FROM app_product_safe
-                where signTime BETWEEN CONCAT(CURDATE(),' 00:00:00') AND CONCAT(CURDATE(),' 23:59:59')
-                limit 1
         ) aps
         JOIN (
             SELECT name
             FROM app_user
             WHERE openId=#{openId} AND STATUS="1"
         )au ON  au.name=aps.signName
+        where signTime BETWEEN CONCAT(CURDATE(),' 00:00:00') AND CONCAT(CURDATE(),' 23:59:59')
+        limit 1
     </select>
 
 
diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppUserServiceImpl.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppUserServiceImpl.java
index c98688a..3946a90 100644
--- a/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppUserServiceImpl.java
+++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppUserServiceImpl.java
@@ -33,7 +33,6 @@
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.ibatis.annotations.Update;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
@@ -90,7 +89,7 @@
         List<AppUser> appUserList = this.baseMapper.selectPage(page, entityWrapper);
         Map<String, String> dictRoleMap = getDictRole(true);
         for (AppUser appUser : appUserList) {
-            appUser.setRole(dictRoleMap.containsKey(appUser.getRole()) ? dictRoleMap.get(appUser.getRole()) : null);
+//            appUser.setRole(dictRoleMap.containsKey(appUser.getRole()) ? dictRoleMap.get(appUser.getRole()) : null);
             appUser.setProjectNames(tranIdsToStrNames(appUser.getProjectIds()));
         }
         page.setRecords(appUserList);
diff --git a/casic-web/src/main/java/com/casic/missiles/CasicApplication.java b/casic-web/src/main/java/com/casic/missiles/CasicApplication.java
index 2e7e9a7..2d36cb3 100644
--- a/casic-web/src/main/java/com/casic/missiles/CasicApplication.java
+++ b/casic-web/src/main/java/com/casic/missiles/CasicApplication.java
@@ -1,7 +1,5 @@
 package com.casic.missiles;
 
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.annotations.TableId;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.boot.SpringApplication;
diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml
index b540b70..0b2a040 100644
--- a/casic-web/src/main/resources/config/application-dev.yml
+++ b/casic-web/src/main/resources/config/application-dev.yml
@@ -6,8 +6,8 @@
 spring:
  datasource:
     url: jdbc:mysql://139.198.18.188:3306/product_device?autoReconnect=true&useUnicode=true&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull&characterEncoding=GB2312
-    username: brroot
-    password: brroot#203
+    username: pcroot
+    password: pcroot#203
     initial-size: 2
     min-idle: 1
 #flowable数据源和多数据源配置
@@ -17,13 +17,12 @@
                 /app/user/login,/app/user/project,/product/safe/add,/product/safe/sign-status,/product/safe/update,/well/pre/listPage,/product/safe/today-detail
   file-upload-path:  D:\cz\203\workspace\product-device\casic-web\src\main\resources\static\
   file-download-path:  D:\cz\203\workspace\product-device\casic-web\src\main\resources\excel\
-
   producerName: producer
   repairName: repair
   wxUrl: https://api.weixin.qq.com/sns/jscode2session  #获取微信openid
   appid: wx8f4b331065a9ac2e #微信小程序开发appid
   secret: 6c22ca8bca0b239c0cb152f9230e9c52 #微信小程序开发密钥
-  photoPath: http://192.168.8.110:8083/static/ #导出照片位置存放目录
+  photoPath: https://logapi.smartlog.work/static/ #导出照片位置存放目录
   export-file-delete: 0 0 */1 * * ? #日志文件有效扫描时间（现为一天扫描一次）
   file-valid-days: -1  #日志文件有效天数
 logging:
diff --git a/pom.xml b/pom.xml
index 770e714..a595bc3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>