简化部分配置

base-manager/db/params.sql

@@ -367,3 +367,5 @@ INSERT INTO `mortals_xhx_product` VALUES (null, '样表机', 'ybj', '样表机',
 
 
 INSERT INTO `mortals_sys_model` VALUES (null, '基础设置平台', 'basic setting ', 'file/fileupload/1672810627756.svg', 'http://192.168.0.98:11071/#/jump', '基础设置平台-test', 1, '2022-04-20 09:55:59', 1, '2023-01-04 13:37:09');
+
+INSERT INTO `mortals_xhx_task` VALUES (null, '用户同步', 'syncUserTask', 0, 'SyncUserTask', NULL, NULL, 4, 120, '00', NULL, '127.0.1.1', '2023-01-13 15:41:40', 0, '2022-07-06 10:49:48', 1, '系统管理员');

base-manager/src/main/java/com/mortals/xhx/daemon/applicationservice/DemoStartService.java

-package com.mortals.xhx.daemon.applicationservice;
-
-import com.mortals.framework.util.ThreadPool;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import com.mortals.framework.springcloud.service.IApplicationService;
-
-
-@Component
-public class DemoStartService implements IApplicationService {
-    
-    private static Log logger = LogFactory.getLog(DemoStartService.class);
-
-
-    @Override
-    public void start() {
-        ThreadPool.getInstance().init(10);
-        logger.info("开始服务..[配置已加载完成，但部分框架还未初始化，比如：Kafka]");
-    }
-
-    @Override
-    public void stop() {
-        logger.info("停止服务..");
-    }
-
-}

base-manager/src/main/resources/sqlmap/module/matter/MatterMapperExt.xml

@@ -10,7 +10,7 @@
         LEFT JOIN ( SELECT matterCode FROM mortals_sys_site_matter
         <trim suffixOverrides="where" suffix="">
             <if test="condition.siteId!=null and condition.siteId!=''">
-                where  a.siteId = #{condition.siteId,jdbcType=VARCHAR}
+                where  siteId = #{condition.siteId,jdbcType=VARCHAR}
             </if>
         </trim>
          )AS b ON a.matterNo = b.matterCode
@@ -39,7 +39,7 @@
         LEFT JOIN ( SELECT matterCode FROM mortals_sys_site_matter
         <trim suffixOverrides="where" suffix="">
             <if test="condition.siteId!=null and condition.siteId!=''">
-                where  a.siteId = #{condition.siteId,jdbcType=VARCHAR}
+                where  siteId = #{condition.siteId,jdbcType=VARCHAR}
             </if>
         </trim>
         ) AS b ON a.matterNo = b.matterCode

portal-manager/src/main/bin/deploy.sh

@@ -93,7 +93,7 @@ project_deploy() {
 project_ui_deploy() {
   writelog "${PROJECT_NAME}_ui_deploy"
   clear_ui_deploy ${PROJECT_UI_EXECPATH}
-  tar -zvxf ./${PROJECT_UI_FILENAME} -C ${PUBLISH_PATH}
+  tar -zvx ./${PROJECT_UI_FILENAME} -C ${PUBLISH_PATH}
   writelog "${PROJECT_NAME}_ui_deploy_finish"
 
 }