添加申请页面抓取

base-manager/src/main/java/com/mortals/xhx/base/system/upload/service/impl/UploadServiceImpl.java

@@ -7,6 +7,7 @@ import com.mortals.framework.service.IUser;
 import com.mortals.framework.util.StringUtils;
 import com.mortals.xhx.base.system.upload.service.UploadService;
 import com.mortals.xhx.common.code.UploadFileType;
+import com.mortals.xhx.utils.SpringUtils;
 import lombok.Getter;
 import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.logging.Log;

base-manager/src/main/java/com/mortals/xhx/base/system/user/service/impl/UserServiceImpl.java

@@ -297,9 +297,9 @@ public class UserServiceImpl extends AbstractCRUDServiceImpl<UserDao, UserEntity
     @Override
     public void updateUserList(List<UserPdu> list) {
         //更新本地用户信息，并且更新用户站点树
-        list.forEach(user -> {
-            UserEntity tempUserEntity = this.selectOne(new UserQuery().loginName(user.getLoginName()));
-            if (ObjectUtils.isEmpty(tempUserEntity)) {
+        for (UserPdu user : list) {
+            int count = this.count(new UserQuery().loginName(user.getLoginName()),null);
+            if (count==0) {
                 //新增
                 UserEntity entity = new UserEntity();
                 entity.initAttrValue();
@@ -307,7 +307,6 @@ public class UserServiceImpl extends AbstractCRUDServiceImpl<UserDao, UserEntity
                 this.save(entity);
                 Context context = new Context();
                 context.setUser(entity);
-
                 ThreadPool.getInstance().execute(new SyncTreeSiteThread(context));
             } else {
                 //更新
@@ -318,7 +317,7 @@ public class UserServiceImpl extends AbstractCRUDServiceImpl<UserDao, UserEntity
                 context.setUser(userEntity);
                 ThreadPool.getInstance().execute(new SyncTreeSiteThread( context));
             }
-        });
+        }
     }
 
 

deploy.sh

@@ -148,8 +148,8 @@ setup_java() {
     #yum -y remove tzdata-java.noarch
   else
     writelog "ubuntu java clear"
-    apt-get purge openjdk*
-    apt-get purge icedtea-* openjdk-*
+    #apt-get -y purge openjdk*
+    #apt-get -y purge icedtea-* openjdk-*
   fi
   rm -rf ${JAVA_HOME}
   mkdir -p ${JAVA_HOME}
@@ -224,7 +224,18 @@ setup_mysql() {
   mkdir -p ${MYSQL_EXECPATH}/mysql-files
   groupadd mysql
   useradd -r -g mysql mysql
-
+  system_version=$(unix_is_centos)
+    if [[ ${system_version} == "centos" ]]; then
+      writelog "centos"
+      yum -y install libncurses*
+     # yum -y remove java-*-openjdk* #卸载centos中的openjdk
+      #yum -y remove tzdata-java.noarch
+    else
+      writelog "ubuntu"
+      apt -y install libncurses*
+      #apt-get purge openjdk*
+      #apt-get purge icedtea-* openjdk-*
+    fi
   writelog "exccmd  tar -zvxf ${BASEDIR}/soft/${MYSQL}/${MYSQL_CENTOS_FILENAME} -C ${MYSQL_EXECPATH} --strip-components 1"
   tar -zvxf ${BASEDIR}/soft/${MYSQL}/${MYSQL_CENTOS_FILENAME} -C ${MYSQL_EXECPATH} --strip-components 1
   cd ${MYSQL_EXECPATH}
@@ -232,19 +243,30 @@ setup_mysql() {
   chmod 750 mysql-file
 
   echo "[mysqld]
-  datadir=${MYSQL_DATA_PATH}
-  port = ${MYSQL_PORT}
-  sql_mode=NO_ENGINE_SUBSTITUTION,STRICT_TRANS_TABLES
-  symbolic-links=0
-  max_connections=400
-  innodb_file_per_table=1
-  #表名存储在磁盘是小写的，但是比较的时候是不区分大小写
-  lower_case_table_names=1
-  #忽略密码
-  skip-grant-tables
+datadir=${MYSQL_DATA_PATH}
+socket=/tmp/mysql.sock
+port = ${MYSQL_PORT}
+sql_mode=NO_ENGINE_SUBSTITUTION,STRICT_TRANS_TABLES
+symbolic-links=0
+max_connections=400
+innodb_file_per_table=1
+#表名存储在磁盘是小写的，但是比较的时候是不区分大小写
+lower_case_table_names=1
+#忽略密码
+skip-grant-tables
+
+[client]
+default-character-set=utf8
+socket=/tmp/mysql.sock
+
+[mysql]
+default-character-set=utf8
+socket=/tmp/mysql.sock
     " >${MYSQL_CONF_PATH}
   #初始化
-  bin/mysqld --initialize --user=mysql --datadir=${MYSQL_DATA_PATH} --basedir=${MYSQL_EXECPATH}
+  writelog "mysql init cmd:   bin/mysqld --initialize --user=mysql --datadir=${MYSQL_DATA_PATH} --basedir=${MYSQL_EXECPATH} --socket=/tmp/mysql.sock"
+  bin/mysqld --initialize --user=mysql --datadir=${MYSQL_DATA_PATH} --basedir=${MYSQL_EXECPATH} --socket=/tmp/mysql.sock
+  #bin/mysqld --initialize-insecure --user=mysql --datadir=${MYSQL_DATA_PATH} --basedir=${MYSQL_EXECPATH} --socket=/tmp/mysql.sock
 
   #创建软连接
   ln -s ${MYSQL_EXECPATH}/support-files/mysql.server /etc/init.d/mysql
@@ -252,7 +274,7 @@ setup_mysql() {
   export PATH=$PATH:${MYSQL_EXECPATH}/bin
   source /etc/profile
   service mysql restart
-  mysql -uroot -p123 <${BASEDIR}/soft/${MYSQL}/user.sql
+  mysql -uroot -p <${BASEDIR}/soft/${MYSQL}/user.sql
   sed -i "s/skip-grant-tables/#skip-grant-tables/g" ${MYSQL_CONF_PATH}
   service mysql restart
 
@@ -304,7 +326,7 @@ setup_nginx() {
   else
     writelog "ubuntu nginx clear"
     apt-get purge nginx*
-    apt-get -y install pcre-devel openssl openssl-devel gd-devel gcc gcc-c++
+    apt-get -y install  build-essential openssl libssl-dev libpcre3 libpcre3-dev zlib1g zlib1g-dev
   fi
 
   rm -rf ${NGINX_EXECPATH}
@@ -313,6 +335,7 @@ setup_nginx() {
   tar -zvxf ${BASEDIR}/soft/${NGINX}/${NGINX_FILENAME} -C ${NGINX_EXECPATH} --strip-components 1
   cd ${NGINX_EXECPATH}
 
+  #./configure --prefix=${NGINX_EXECPATH} --conf-path=${NGINX_CONF} --with-pcre=/home/pcre-8.45
   ./configure --prefix=${NGINX_EXECPATH} --conf-path=${NGINX_CONF}
   writelog "nginx make start"
   make

pom.xml

@@ -38,7 +38,6 @@
 
 
     <dependencies>
-
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-redis</artifactId>