refactor(config): update database and redis configurations

- Changed MySQL connection URL, username and password in test configuration
- Updated Redis host and port in both production and test configurations
- Corrected schema names in multiple XML mapper files from gxwebsoft_core to websoft_core
- Modified table joins to use updated core schema references
- Adjusted datasource settings to match new environment requirements

docs/微信小程序配置检查和修复.sql

@@ -81,7 +81,7 @@ SELECT
     tenant_id,
     deleted,
     comments
-FROM gxwebsoft_core.sys_setting 
+FROM websoft_core.sys_setting
 WHERE setting_key = 'mp-weixin' 
   AND tenant_id = 10550
   AND deleted = 0;
@@ -93,7 +93,7 @@ SELECT
     content,
     tenant_id,
     deleted
-FROM gxwebsoft_core.sys_setting 
+FROM websoft_core.sys_setting
 WHERE setting_key = 'mp-weixin' 
   AND deleted = 0
 ORDER BY tenant_id;

docs/检查微信小程序配置.sql

@@ -9,7 +9,7 @@ SELECT
     content,
     deleted,
     comments
-FROM gxwebsoft_core.sys_setting 
+FROM websoft_core.sys_setting
 WHERE setting_id = 292;
 
 -- 2. 查看租户10550的所有配置
@@ -20,7 +20,7 @@ SELECT
     content,
     deleted,
     comments
-FROM gxwebsoft_core.sys_setting 
+FROM websoft_core.sys_setting
 WHERE tenant_id = 10550
 ORDER BY setting_key;
 
@@ -32,7 +32,7 @@ SELECT
     content,
     deleted,
     comments
-FROM gxwebsoft_core.sys_setting 
+FROM websoft_core.sys_setting
 WHERE setting_key = 'mp-weixin'
 ORDER BY tenant_id;
 
@@ -44,7 +44,7 @@ SELECT
     content,
     deleted,
     comments
-FROM gxwebsoft_core.sys_setting 
+FROM websoft_core.sys_setting
 WHERE setting_key = 'mp-weixin' 
   AND tenant_id = 10550
   AND deleted = 0;
@@ -57,7 +57,7 @@ SELECT
     content,
     deleted,
     comments
-FROM gxwebsoft_core.sys_setting 
+FROM websoft_core.sys_setting
 WHERE setting_key = 'mp-weixin' 
   AND deleted = 0
 ORDER BY tenant_id;
@@ -67,7 +67,7 @@ SELECT
     tenant_id,
     COUNT(*) as config_count,
     GROUP_CONCAT(setting_key) as setting_keys
-FROM gxwebsoft_core.sys_setting 
+FROM websoft_core.sys_setting
 WHERE deleted = 0
 GROUP BY tenant_id
 ORDER BY tenant_id;

src/main/java/com/gxwebsoft/bszx/mapper/xml/BszxBmMapper.xml

@@ -8,7 +8,7 @@
         FROM bszx_bm a
         LEFT JOIN cms_article b ON a.form_id = b.article_id
         LEFT JOIN bszx_branch c ON a.branch_id = c.id
-        LEFT JOIN gxwebsoft_core.sys_user u ON a.user_id = u.user_id
+        LEFT JOIN websoft_core.sys_user u ON a.user_id = u.user_id
         <where>
             <if test="param.id != null">
                 AND a.id = #{param.id}

src/main/java/com/gxwebsoft/bszx/mapper/xml/BszxPayMapper.xml

@@ -7,7 +7,7 @@
         SELECT a.*,b.title as formName,u.phone as mobile,u.avatar,u.nickname
         FROM bszx_pay a
         LEFT JOIN cms_article b ON a.form_id = b.article_id
-        LEFT JOIN gxwebsoft_core.sys_user u ON a.user_id = u.user_id
+        LEFT JOIN websoft_core.sys_user u ON a.user_id = u.user_id
         <where>
             <if test="param.id != null">
                 AND a.id = #{param.id}

src/main/java/com/gxwebsoft/clinic/mapper/xml/ClinicAppointmentMapper.xml

@@ -6,7 +6,7 @@
     <sql id="selectSql">
         SELECT a.*, b.nickname, b.phone, c.real_name as doctorName, c.position as doctorPosition
         FROM clinic_appointment a
-        LEFT JOIN gxwebsoft_core.sys_user b ON a.user_id = b.user_id
+        LEFT JOIN websoft_core.sys_user b ON a.user_id = b.user_id
         LEFT JOIN clinic_doctor_user c ON a.doctor_id = c.user_id
         <where>
             <if test="param.id != null">

src/main/java/com/gxwebsoft/clinic/mapper/xml/ClinicDoctorUserMapper.xml

@@ -6,7 +6,7 @@
     <sql id="selectSql">
         SELECT a.*, b.nickname, b.phone, b.avatar
         FROM clinic_doctor_user a
-        LEFT JOIN gxwebsoft_core.sys_user b ON a.user_id = b.user_id
+        LEFT JOIN websoft_core.sys_user b ON a.user_id = b.user_id
         <where>
             <if test="param.id != null">
                 AND a.id = #{param.id}

src/main/java/com/gxwebsoft/clinic/mapper/xml/ClinicPatientUserMapper.xml

@@ -6,7 +6,7 @@
   <sql id="selectSql">
     SELECT a.*, b.phone, b.avatar
     FROM clinic_patient_user a
-    LEFT JOIN gxwebsoft_core.sys_user b ON a.user_id = b.user_id
+    LEFT JOIN websoft_core.sys_user b ON a.user_id = b.user_id
     <where>
       <if test="param.id != null">
         AND a.id = #{param.id}

src/main/java/com/gxwebsoft/cms/mapper/xml/CmsArticleMapper.xml

@@ -8,7 +8,7 @@
         FROM cms_article a
         LEFT JOIN cms_navigation b ON a.category_id = b.navigation_id
         LEFT JOIN cms_navigation c ON b.parent_id = c.navigation_id
-        LEFT JOIN gxwebsoft_core.sys_user u ON a.user_id = u.user_id
+        LEFT JOIN websoft_core.sys_user u ON a.user_id = u.user_id
       <where>
             <if test="param.articleId != null">
                 AND a.article_id = #{param.articleId}

src/main/java/com/gxwebsoft/cms/mapper/xml/CmsWebsiteMapper.xml

@@ -6,7 +6,7 @@
     <sql id="selectSql">
         SELECT a.*, b.tenant_name as tenantName
         FROM cms_website a
-        LEFT JOIN gxwebsoft_core.sys_tenant b ON a.tenant_id = b.tenant_id
+        LEFT JOIN websoft_core.sys_tenant b ON a.tenant_id = b.tenant_id
         <where>
             <if test="param.websiteId != null">
                 AND a.website_id = #{param.websiteId}
@@ -180,7 +180,7 @@
   <select id="getByTenantId" resultType="com.gxwebsoft.cms.entity.CmsWebsite">
     SELECT a.*, b.tenant_name as tenantName
     FROM cms_website a
-    LEFT JOIN gxwebsoft_core.sys_tenant b ON a.tenant_id = b.tenant_id
+    LEFT JOIN websoft_core.sys_tenant b ON a.tenant_id = b.tenant_id
     <where>
       <if test="tenantId != null">
         AND a.tenant_id = #{tenantId}
@@ -287,7 +287,7 @@
     SELECT a.*,b.app_id, u.phone as superAdminPhone
     FROM cms_website a
     LEFT JOIN project b ON a.website_id = b.website_id
-    LEFT JOIN gxwebsoft_core.sys_user u ON a.user_id = u.user_id
+    LEFT JOIN websoft_core.sys_user u ON a.user_id = u.user_id
     <where>
       <if test="param.websiteId != null">
         AND a.website_id = #{param.websiteId}

src/main/java/com/gxwebsoft/common/system/mapper/xml/CompanyMapper.xml

@@ -5,9 +5,9 @@
     <!-- 关联查询sql -->
     <sql id="selectSql">
         SELECT a.*,b.tenant_id,b.tenant_name,b.tenant_code,c.title as categoryName
-        FROM gxwebsoft_core.sys_company a
+        FROM websoft_core.sys_company a
-        LEFT JOIN gxwebsoft_core.sys_tenant b ON a.tenant_id = b.tenant_id
+        LEFT JOIN websoft_core.sys_tenant b ON a.tenant_id = b.tenant_id
-        LEFT JOIN gxwebsoft_core.cms_navigation c ON a.category_id = c.navigation_id
+        LEFT JOIN websoft_core.cms_navigation c ON a.category_id = c.navigation_id
         <where>
             <if test="param.companyId != null">
                 AND a.company_id = #{param.companyId}

src/main/java/com/gxwebsoft/common/system/mapper/xml/DictDataMapper.xml

@@ -7,8 +7,8 @@
         SELECT a.*,
         b.dict_code,
         b.dict_name
-        FROM gxwebsoft_core.sys_dict_data a
+        FROM websoft_core.sys_dict_data a
-        LEFT JOIN gxwebsoft_core.sys_dict b ON a.dict_id = b.dict_id
+        LEFT JOIN websoft_core.sys_dict b ON a.dict_id = b.dict_id
         <where>
             AND a.deleted = 0
             <if test="param.dictDataId != null">
@@ -63,7 +63,7 @@
                b.dict_code,
                b.dict_name
         FROM sys_dict_data a
-                 LEFT JOIN gxwebsoft_core.sys_dict b ON a.dict_id = b.dict_id
+                 LEFT JOIN websoft_core.sys_dict b ON a.dict_id = b.dict_id
         WHERE a.dict_data_name = #{dictDataName}
           AND b.dict_code = #{dictCode}
     </select>

src/main/java/com/gxwebsoft/common/system/mapper/xml/DictionaryDataMapper.xml

@@ -8,7 +8,7 @@
         b.dict_code,
         b.dict_name
         FROM sys_dictionary_data a
-        LEFT JOIN gxwebsoft_core.sys_dictionary b ON a.dict_id = b.dict_id
+        LEFT JOIN websoft_core.sys_dictionary b ON a.dict_id = b.dict_id
         <where>
             AND a.deleted = 0
             <if test="param.dictDataId != null">
@@ -63,7 +63,7 @@
                b.dict_code,
                b.dict_name
         FROM sys_dictionary_data a
-                 LEFT JOIN gxwebsoft_core.sys_dictionary b ON a.dict_id = b.dict_id
+                 LEFT JOIN websoft_core.sys_dictionary b ON a.dict_id = b.dict_id
         WHERE a.dict_data_name = #{dictDataName}
           AND b.dict_code = #{dictCode}
     </select>

src/main/java/com/gxwebsoft/common/system/mapper/xml/FileRecordMapper.xml

@@ -10,7 +10,7 @@
         b.avatar,
         c.merchant_code
         FROM sys_file_record a
-        LEFT JOIN gxwebsoft_core.sys_user b ON a.create_user_id = b.user_id
+        LEFT JOIN websoft_core.sys_user b ON a.create_user_id = b.user_id
         LEFT JOIN shop_merchant c ON a.merchant_code = c.merchant_code
         <where>
             <if test="param.id != null">

src/main/java/com/gxwebsoft/common/system/mapper/xml/LoginRecordMapper.xml

@@ -8,7 +8,7 @@
         b.user_id,
         b.nickname
         FROM sys_login_record a
-        LEFT JOIN gxwebsoft_core.sys_user b ON a.username = b.username
+        LEFT JOIN websoft_core.sys_user b ON a.username = b.username
         <where>
             <if test="param.id != null">
                 AND a.id = #{param.id}

src/main/java/com/gxwebsoft/common/system/mapper/xml/OperationRecordMapper.xml

@@ -7,8 +7,8 @@
         SELECT a.*,
         b.nickname,
         b.username
-        FROM gxwebsoft_core.sys_operation_record a
+        FROM websoft_core.sys_operation_record a
-        LEFT JOIN gxwebsoft_core.sys_user b ON a.user_id = b.user_id
+        LEFT JOIN websoft_core.sys_user b ON a.user_id = b.user_id
         <where>
             <if test="param.id != null">
                 AND a.id = #{param.id}

src/main/java/com/gxwebsoft/common/system/mapper/xml/OrganizationMapper.xml

@@ -6,7 +6,7 @@
     <sql id="selectOrgTypeDictSql">
         SELECT ta.*
         FROM sys_dictionary_data ta
-                 LEFT JOIN gxwebsoft_core.sys_dictionary tb
+                 LEFT JOIN websoft_core.sys_dictionary tb
                            ON ta.dict_id = tb.dict_id
                                AND tb.deleted = 0
         WHERE ta.deleted = 0
@@ -23,7 +23,7 @@
         LEFT JOIN (
         <include refid="selectOrgTypeDictSql"/>
         ) b ON a.organization_type = b.dict_data_code
-        LEFT JOIN gxwebsoft_core.sys_user c ON a.leader_id = c.user_id
+        LEFT JOIN websoft_core.sys_user c ON a.leader_id = c.user_id
         <where>
             AND a.deleted = 0
             <if test="param.organizationId != null">

src/main/java/com/gxwebsoft/common/system/mapper/xml/PaymentMapper.xml

@@ -5,7 +5,7 @@
     <!-- 关联查询sql -->
     <sql id="selectSql">
         SELECT a.*
-        FROM gxwebsoft_core.sys_payment a
+        FROM websoft_core.sys_payment a
         <where>
             <if test="param.id != null">
                 AND a.id = #{param.id}
@@ -79,7 +79,7 @@
 
     <select id="getByType" resultType="com.gxwebsoft.common.system.entity.Payment">
         SELECT a.*
-        FROM gxwebsoft_core.sys_payment a
+        FROM websoft_core.sys_payment a
         WHERE a.type = #{param.type}
           AND a.deleted = 0
           AND a.status = 1

src/main/java/com/gxwebsoft/common/system/mapper/xml/PlugMapper.xml

@@ -6,8 +6,8 @@
     <sql id="selectSql">
         SELECT a.*,b.tenant_name,c.company_name,c.short_name,c.domain
         FROM sys_plug a
-        LEFT JOIN gxwebsoft_core.sys_tenant b ON a.tenant_id = b.tenant_id
+        LEFT JOIN websoft_core.sys_tenant b ON a.tenant_id = b.tenant_id
-        LEFT JOIN gxwebsoft_core.sys_company c ON a.tenant_id = c.tenant_id
+        LEFT JOIN websoft_core.sys_company c ON a.tenant_id = c.tenant_id
         <where>
             <if test="param.plugId != null">
               AND a.plug_id = #{param.plugId}

src/main/java/com/gxwebsoft/common/system/mapper/xml/RoleMenuMapper.xml

@@ -9,7 +9,7 @@
         <where>
             AND a.menu_id IN (
             SELECT menu_id FROM sys_role_menu WHERE role_id IN (
-            SELECT ta.role_id FROM sys_user_role ta LEFT JOIN gxwebsoft_core.sys_role tb ON ta.role_id = tb.role_id
+            SELECT ta.role_id FROM sys_user_role ta LEFT JOIN websoft_core.sys_role tb ON ta.role_id = tb.role_id
             WHERE ta.user_id = #{userId} AND tb.deleted = 0
             )
             )

src/main/java/com/gxwebsoft/common/system/mapper/xml/SettingMapper.xml

@@ -5,7 +5,7 @@
   <!-- 关联查询sql -->
   <sql id="selectSql">
     SELECT a.*
-    FROM gxwebsoft_core.sys_setting a
+    FROM websoft_core.sys_setting a
     <where>
       <if test="param.settingKey != null">
         AND a.setting_key = #{param.settingKey}

src/main/java/com/gxwebsoft/common/system/mapper/xml/UserMapper.xml

@@ -5,8 +5,8 @@
     <!-- 性别字典查询sql -->
     <sql id="selectSexDictSql">
         SELECT ta.*
-        FROM gxwebsoft_core.sys_dictionary_data ta
+        FROM websoft_core.sys_dictionary_data ta
-                 LEFT JOIN gxwebsoft_core.sys_dictionary tb
+                 LEFT JOIN websoft_core.sys_dictionary tb
                            ON ta.dict_id = tb.dict_id
                                AND tb.deleted = 0
         WHERE ta.deleted = 0
@@ -17,8 +17,8 @@
     <sql id="selectUserRoleSql">
         SELECT a.user_id,
                GROUP_CONCAT(b.role_name) role_name
-        FROM gxwebsoft_core.sys_user_role a
+        FROM websoft_core.sys_user_role a
-                 LEFT JOIN gxwebsoft_core.sys_role b ON a.role_id = b.role_id
+                 LEFT JOIN websoft_core.sys_role b ON a.role_id = b.role_id
         GROUP BY a.user_id
     </sql>
 
@@ -28,15 +28,15 @@
         c.dict_data_name sex_name,
         e.tenant_name,
         h.dealer_id
-        FROM gxwebsoft_core.sys_user a
+        FROM websoft_core.sys_user a
         LEFT JOIN (
         <include refid="selectSexDictSql"/>
         ) c ON a.sex = c.dict_data_code
         LEFT JOIN(
         <include refid="selectUserRoleSql"/>
         ) d ON a.user_id = d.user_id
-        LEFT JOIN gxwebsoft_core.sys_tenant e ON a.tenant_id = e.tenant_id
+        LEFT JOIN websoft_core.sys_tenant e ON a.tenant_id = e.tenant_id
-        LEFT JOIN gxwebsoft_core.sys_user_referee h ON a.user_id = h.user_id and h.deleted = 0
+        LEFT JOIN websoft_core.sys_user_referee h ON a.user_id = h.user_id and h.deleted = 0
         <where>
             <if test="param.userId != null">
                 AND a.user_id = #{param.userId}
@@ -164,7 +164,7 @@
     <select id="selectByUsername" resultType="com.gxwebsoft.common.system.entity.User">
         SELECT a.* ,
         c.dict_data_name sex_name,f.oauth_id as openid,f.unionid
-        FROM gxwebsoft_core.sys_user a
+        FROM websoft_core.sys_user a
         LEFT JOIN (
         <include refid="selectSexDictSql"/>
         ) c ON a.sex = c.dict_data_code
@@ -185,7 +185,7 @@
     <!-- 根据手机号码查询 -->
     <select id="selectByPhone" resultType="com.gxwebsoft.common.system.entity.User">
       SELECT a.*
-      FROM gxwebsoft_core.sys_user a
+      FROM websoft_core.sys_user a
       <where>
         AND a.deleted = 0
         AND a.phone = #{phone}
@@ -201,7 +201,7 @@
   <!-- 获取所有的邮政协会/管局工作人员 -->
   <select id="listByAlert" resultType="com.gxwebsoft.common.system.entity.User">
     SELECT a.*
-    FROM gxwebsoft_core.sys_user a
+    FROM websoft_core.sys_user a
     <where>
       AND a.deleted = 0
       AND a.organization_id = 420 OR a.organization_id = 421
@@ -216,13 +216,13 @@
 
   <!-- 查询单条数据 -->
   <select id="getOne" resultType="com.gxwebsoft.common.system.entity.User">
-    SELECT * FROM gxwebsoft_core.sys_user WHERE user_id = #{param.userId} and deleted = 0
+    SELECT * FROM websoft_core.sys_user WHERE user_id = #{param.userId} and deleted = 0
   </select>
 
   <!-- 查询统计数据 -->
   <select id="selectListStatisticsRel" resultType="com.gxwebsoft.common.system.entity.User">
     SELECT a.*
-    FROM gxwebsoft_core.sys_user a
+    FROM websoft_core.sys_user a
     <where>
       AND a.deleted = 0
     </where>
@@ -230,13 +230,13 @@
 
   <!-- 更新用户信息 -->
   <update id="updateByUserId">
-    UPDATE gxwebsoft_core.sys_user SET grade_id = #{param.gradeId} WHERE user_id = #{param.userId}
+    UPDATE websoft_core.sys_user SET grade_id = #{param.gradeId} WHERE user_id = #{param.userId}
   </update>
 
   <select id="pageAdminByPhone" resultType="com.gxwebsoft.common.system.entity.User">
     SELECT a.*,b.tenant_name
-    FROM gxwebsoft_core.sys_user a
+    FROM websoft_core.sys_user a
-    LEFT JOIN gxwebsoft_core.sys_tenant b ON a.tenant_id = b.tenant_id
+    LEFT JOIN websoft_core.sys_tenant b ON a.tenant_id = b.tenant_id
     <where>
       <if test="param.phone != null">
         AND a.phone = #{param.phone}

src/main/java/com/gxwebsoft/common/system/mapper/xml/UserRoleMapper.xml

@@ -24,7 +24,7 @@
     <select id="selectByUserIds" resultType="com.gxwebsoft.common.system.entity.Role">
         SELECT a.user_id, b.*
         FROM sys_user_role a
-        LEFT JOIN gxwebsoft_core.sys_role b ON a.role_id = b.role_id
+        LEFT JOIN websoft_core.sys_role b ON a.role_id = b.role_id
         WHERE a.user_id IN
         <foreach collection="userIds" open="(" close=")" separator="," item="userId">
             #{userId}

src/main/java/com/gxwebsoft/hjm/mapper/xml/HjmBxLogMapper.xml

@@ -7,7 +7,7 @@
         SELECT a.*, b.name as carName,b.code as carNo, b.image as carAvatar, u.real_name as realName, u.nickname
         FROM hjm_bx_log a
         LEFT JOIN hjm_car b ON a.car_id = b.id
-        LEFT JOIN gxwebsoft_core.sys_user u ON a.user_id = u.user_id
+        LEFT JOIN websoft_core.sys_user u ON a.user_id = u.user_id
         <where>
             <if test="param.id != null">
                 AND a.id = #{param.id}

src/main/java/com/gxwebsoft/hjm/mapper/xml/HjmCarMapper.xml

@@ -8,10 +8,10 @@
     f.comments as
     parentOrganizationAdmin, u.real_name as driver,u.phone as driverPhone
     FROM hjm_car a
-    LEFT JOIN gxwebsoft_core.sys_organization b ON a.organization_id = b.organization_id
+    LEFT JOIN websoft_core.sys_organization b ON a.organization_id = b.organization_id
-    LEFT JOIN gxwebsoft_core.sys_organization f ON a.organization_parent_id = f.organization_id
+    LEFT JOIN websoft_core.sys_organization f ON a.organization_parent_id = f.organization_id
     LEFT JOIN hjm_fence e ON a.fence_id = e.id
-    LEFT JOIN gxwebsoft_core.sys_user u ON a.driver_id = u.user_id
+    LEFT JOIN websoft_core.sys_user u ON a.driver_id = u.user_id
     <where>
       <if test="param.id != null">
         AND a.id = #{param.id}
@@ -124,10 +124,10 @@
     f.comments as
     parentOrganizationAdmin, u.real_name as driver,u.phone as driverPhone
     FROM hjm_car a
-    LEFT JOIN gxwebsoft_core.sys_organization b ON a.organization_id = b.organization_id
+    LEFT JOIN websoft_core.sys_organization b ON a.organization_id = b.organization_id
-    LEFT JOIN gxwebsoft_core.sys_organization f ON a.organization_parent_id = f.organization_id
+    LEFT JOIN websoft_core.sys_organization f ON a.organization_parent_id = f.organization_id
     LEFT JOIN hjm_fence e ON a.fence_id = e.id
-    LEFT JOIN gxwebsoft_core.sys_user u ON a.driver_id = u.user_id
+    LEFT JOIN websoft_core.sys_user u ON a.driver_id = u.user_id
     <where>
       <if test="code != null">
         AND a.code = #{code}

src/main/java/com/gxwebsoft/hjm/mapper/xml/HjmExamLogMapper.xml

@@ -6,7 +6,7 @@
     <sql id="selectSql">
         SELECT a.*, b.nickname, b.phone, b.real_name
         FROM hjm_exam_log a
-        LEFT JOIN gxwebsoft_core.sys_user b ON a.user_id = b.user_id
+        LEFT JOIN websoft_core.sys_user b ON a.user_id = b.user_id
         <where>
             <if test="param.id != null">
                 AND a.id = #{param.id}

src/main/java/com/gxwebsoft/hjm/mapper/xml/HjmViolationMapper.xml

@@ -7,8 +7,8 @@
         SELECT DISTINCT a.*,b.image
         FROM hjm_violation a
         LEFT JOIN hjm_car b ON a.code = b.code
-        LEFT JOIN gxwebsoft_core.sys_organization c ON b.organization_id = c.organization_id
+        LEFT JOIN websoft_core.sys_organization c ON b.organization_id = c.organization_id
-        LEFT JOIN gxwebsoft_core.sys_organization f ON b.organization_parent_id = f.organization_id
+        LEFT JOIN websoft_core.sys_organization f ON b.organization_parent_id = f.organization_id
         <where>
             <if test="param.id != null">
                 AND a.id = #{param.id}

src/main/java/com/gxwebsoft/house/mapper/xml/HouseInfoMapper.xml

@@ -7,7 +7,7 @@
     SELECT a.*,
     b.nickname,b.avatar,b.grade_id, b.phone as userPhone
     FROM house_info a
-    LEFT JOIN gxwebsoft_core.sys_user b ON a.user_id = b.user_id
+    LEFT JOIN websoft_core.sys_user b ON a.user_id = b.user_id
     <where>
       <if test="param.houseId != null">
         AND a.house_id = #{param.houseId}

src/main/java/com/gxwebsoft/oa/mapper/xml/OaAssetsCodeMapper.xml

@@ -6,7 +6,7 @@
     <sql id="selectSql">
         SELECT a.*, b.short_name AS tenantName,b.company_logo as logo
         FROM oa_assets_code a
-      LEFT JOIN gxwebsoft_core.sys_company b ON a.tenant_id = b.tenant_id
+      LEFT JOIN websoft_core.sys_company b ON a.tenant_id = b.tenant_id
         <where>
             <if test="param.id != null">
                 AND a.id = #{param.id}

src/main/java/com/gxwebsoft/oa/mapper/xml/OaAssetsDomainMapper.xml

@@ -6,7 +6,7 @@
     <sql id="selectSql">
         SELECT a.*, b.short_name AS tenantName,b.company_logo as logo
         FROM oa_assets_domain a
-      LEFT JOIN gxwebsoft_core.sys_company b ON a.tenant_id = b.tenant_id
+      LEFT JOIN websoft_core.sys_company b ON a.tenant_id = b.tenant_id
         <where>
             <if test="param.domainId != null">
                 AND a.domain_id = #{param.domainId}

src/main/java/com/gxwebsoft/oa/mapper/xml/OaAssetsEmailMapper.xml

@@ -6,7 +6,7 @@
     <sql id="selectSql">
         SELECT a.*, b.short_name AS tenantName,b.company_logo as logo
         FROM oa_assets_email a
-      LEFT JOIN gxwebsoft_core.sys_company b ON a.tenant_id = b.tenant_id
+      LEFT JOIN websoft_core.sys_company b ON a.tenant_id = b.tenant_id
         <where>
             <if test="param.emailId != null">
                 AND a.email_id = #{param.emailId}

src/main/java/com/gxwebsoft/oa/mapper/xml/OaAssetsMapper.xml

@@ -6,7 +6,7 @@
     <sql id="selectSql">
         SELECT a.*, b.short_name AS tenantName,b.company_logo as logo
         FROM oa_assets a
-        LEFT JOIN gxwebsoft_core.sys_company b ON a.tenant_id = b.tenant_id
+        LEFT JOIN websoft_core.sys_company b ON a.tenant_id = b.tenant_id
         <where>
             <if test="param.assetsId != null">
                 AND a.assets_id = #{param.assetsId}

src/main/java/com/gxwebsoft/oa/mapper/xml/OaAssetsMysqlMapper.xml

@@ -6,7 +6,7 @@
     <sql id="selectSql">
         SELECT a.*, b.short_name AS tenantName,b.company_logo as logo
         FROM oa_assets_mysql a
-        LEFT JOIN gxwebsoft_core.sys_company b ON a.tenant_id = b.tenant_id
+        LEFT JOIN websoft_core.sys_company b ON a.tenant_id = b.tenant_id
         <where>
             <if test="param.mysqlId != null">
                 AND a.mysql_id = #{param.mysqlId}

src/main/java/com/gxwebsoft/oa/mapper/xml/OaAssetsSiteMapper.xml

@@ -6,7 +6,7 @@
     <sql id="selectSql">
         SELECT a.*, b.short_name AS tenantName,b.company_logo as logo
         FROM oa_assets_site a
-      LEFT JOIN gxwebsoft_core.sys_company b ON a.tenant_id = b.tenant_id
+      LEFT JOIN websoft_core.sys_company b ON a.tenant_id = b.tenant_id
         <where>
             <if test="param.websiteId != null">
                 AND a.website_id = #{param.websiteId}

src/main/java/com/gxwebsoft/oa/mapper/xml/OaAssetsSoftwareCertMapper.xml

@@ -6,7 +6,7 @@
     <sql id="selectSql">
         SELECT a.*, b.short_name AS tenantName,b.company_logo as logo
         FROM oa_assets_software_cert a
-        LEFT JOIN gxwebsoft_core.sys_company b ON a.tenant_id = b.tenant_id
+        LEFT JOIN websoft_core.sys_company b ON a.tenant_id = b.tenant_id
         <where>
             <if test="param.id != null">
                 AND a.id = #{param.id}

src/main/java/com/gxwebsoft/oa/mapper/xml/OaAssetsSslMapper.xml

@@ -6,7 +6,7 @@
     <sql id="selectSql">
         SELECT a.*, b.short_name AS tenantName,b.company_logo as logo
         FROM oa_assets_ssl a
-        LEFT JOIN gxwebsoft_core.sys_company b ON a.tenant_id = b.tenant_id
+        LEFT JOIN websoft_core.sys_company b ON a.tenant_id = b.tenant_id
         <where>
             <if test="param.sslId != null">
                 AND a.ssl_id = #{param.sslId}

src/main/java/com/gxwebsoft/oa/mapper/xml/OaAssetsTrademarkMapper.xml

@@ -6,7 +6,7 @@
     <sql id="selectSql">
         SELECT a.*, b.short_name AS tenantName,b.company_logo as logo
         FROM oa_assets_trademark a
-        LEFT JOIN gxwebsoft_core.sys_company b ON a.tenant_id = b.tenant_id
+        LEFT JOIN websoft_core.sys_company b ON a.tenant_id = b.tenant_id
         <where>
             <if test="param.id != null">
                 AND a.id = #{param.id}

src/main/java/com/gxwebsoft/oa/mapper/xml/OaAssetsVhostMapper.xml

@@ -6,7 +6,7 @@
     <sql id="selectSql">
         SELECT a.*, b.short_name AS tenantName,b.company_logo as logo
         FROM oa_assets_vhost a
-      LEFT JOIN gxwebsoft_core.sys_company b ON a.tenant_id = b.tenant_id
+      LEFT JOIN websoft_core.sys_company b ON a.tenant_id = b.tenant_id
         <where>
             <if test="param.vhostId != null">
                 AND a.vhost_id = #{param.vhostId}

src/main/java/com/gxwebsoft/project/mapper/xml/ProjectFieldMapper.xml

@@ -6,8 +6,8 @@
   <sql id="selectSql">
     SELECT a.*, b.avatar AS avatar, b.nickname, c.nickname as updateUserName, c.avatar as updateUserAvatar
     FROM project_field a
-    LEFT JOIN gxwebsoft_core.sys_user b ON a.user_id = b.user_id
+    LEFT JOIN websoft_core.sys_user b ON a.user_id = b.user_id
-    LEFT JOIN gxwebsoft_core.sys_user c ON a.update_user_id = c.user_id
+    LEFT JOIN websoft_core.sys_user c ON a.update_user_id = c.user_id
     <where>
       <if test="param.id != null">
         AND a.id = #{param.id}

src/main/java/com/gxwebsoft/project/mapper/xml/ProjectMapper.xml

@@ -6,9 +6,9 @@
     <sql id="selectSql">
         SELECT a.*, b.real_name as nickname, b.avatar,c.website_type as appType, u.real_name as companyName, u.phone as superAdminPhone
         FROM project a
-        LEFT JOIN gxwebsoft_core.sys_user b ON a.user_id = b.user_id
+        LEFT JOIN websoft_core.sys_user b ON a.user_id = b.user_id
         LEFT JOIN cms_website c ON a.website_id = c.website_id
-        LEFT JOIN gxwebsoft_core.sys_user u ON a.company_id = u.user_id
+        LEFT JOIN websoft_core.sys_user u ON a.company_id = u.user_id
         <where>
             <if test="param.appId != null">
                 AND a.app_id = #{param.appId}

src/main/java/com/gxwebsoft/project/mapper/xml/ProjectRenewMapper.xml

@@ -7,7 +7,7 @@
         SELECT a.*, b.app_icon, b.app_name, b.expiration_time,c.real_name as nickname
         FROM project_renew a
         LEFT JOIN project b ON a.app_id = b.app_id
-        LEFT JOIN gxwebsoft_core.sys_user c ON a.user_id = c.user_id
+        LEFT JOIN websoft_core.sys_user c ON a.user_id = c.user_id
         <where>
             <if test="param.appRenewId != null">
                 AND a.app_renew_id = #{param.appRenewId}

src/main/java/com/gxwebsoft/pwl/mapper/xml/PwlProjectMapper.xml

@@ -6,8 +6,8 @@
     <sql id="selectSql">
         SELECT a.*, u.real_name as realName, u.phone, u.avatar, dt.dict_data_name as invoiceTypeName
         FROM pwl_project a
-        LEFT JOIN gxwebsoft_core.sys_user u ON a.user_id = u.user_id
+        LEFT JOIN websoft_core.sys_user u ON a.user_id = u.user_id
-        LEFT JOIN gxwebsoft_core.sys_dict_data dt ON a.invoice_type = dt.dict_data_id
+        LEFT JOIN websoft_core.sys_dict_data dt ON a.invoice_type = dt.dict_data_id
         <where>
             <if test="param.id != null">
                 AND a.id = #{param.id}
@@ -156,7 +156,7 @@
 
     <!-- 查询全部 -->
     <select id="listByCount" resultType="com.gxwebsoft.common.system.entity.User">
-      SELECT * FROM gxwebsoft_core.sys_user WHERE deleted = 0
+      SELECT * FROM websoft_core.sys_user WHERE deleted = 0
     </select>
 
 

src/main/java/com/gxwebsoft/shop/mapper/xml/ShopChatMessageMapper.xml

@@ -7,8 +7,8 @@
         SELECT a.*, b.nickname as formUserName, b.avatar as formUserAvatar, b.phone as formUserPhone, b.alias as formUserAlias,
         c.nickname as toUserName, c.avatar as toUserAvatar, c.phone as toUserPhone, c.alias as toUserAlias
         FROM shop_chat_message a
-        LEFT JOIN gxwebsoft_core.sys_user b ON a.form_user_id = b.user_id
+        LEFT JOIN websoft_core.sys_user b ON a.form_user_id = b.user_id
-        LEFT JOIN gxwebsoft_core.sys_user c ON a.to_user_id = c.user_id
+        LEFT JOIN websoft_core.sys_user c ON a.to_user_id = c.user_id
         <where>
             <if test="param.id != null">
                 AND a.id = #{param.id}

src/main/java/com/gxwebsoft/shop/mapper/xml/ShopDealerApplyMapper.xml

@@ -6,8 +6,8 @@
     <sql id="selectSql">
         SELECT a.*, b.nickname as nickName, b.phone, c.nickname as refereeName, d.rate
         FROM shop_dealer_apply a
-        LEFT JOIN gxwebsoft_core.sys_user b ON a.user_id = b.user_id
+        LEFT JOIN websoft_core.sys_user b ON a.user_id = b.user_id
-        LEFT JOIN gxwebsoft_core.sys_user c ON a.referee_id = c.user_id
+        LEFT JOIN websoft_core.sys_user c ON a.referee_id = c.user_id
         LEFT JOIN shop_dealer_user d ON a.user_id = d.user_id
         <where>
             <if test="param.applyId != null">

src/main/java/com/gxwebsoft/shop/mapper/xml/ShopDealerOrderMapper.xml

@@ -6,10 +6,10 @@
     <sql id="selectSql">
         SELECT a.*, b.nickname, c.nickname AS firstNickname, d.nickname AS secondNickname, e.nickname AS thirdNickname, f.rate, f.price
         FROM shop_dealer_order a
-        LEFT JOIN gxwebsoft_core.sys_user b ON a.user_id = b.user_id
+        LEFT JOIN websoft_core.sys_user b ON a.user_id = b.user_id
-        LEFT JOIN gxwebsoft_core.sys_user c ON a.first_user_id = c.user_id
+        LEFT JOIN websoft_core.sys_user c ON a.first_user_id = c.user_id
-        LEFT JOIN gxwebsoft_core.sys_user d ON a.second_user_id = d.user_id
+        LEFT JOIN websoft_core.sys_user d ON a.second_user_id = d.user_id
-        LEFT JOIN gxwebsoft_core.sys_user e ON a.third_user_id = e.user_id
+        LEFT JOIN websoft_core.sys_user e ON a.third_user_id = e.user_id
         LEFT JOIN shop_dealer_user f ON a.user_id = f.user_id
         <where>
             <if test="param.id != null">

src/main/java/com/gxwebsoft/shop/mapper/xml/ShopDealerRefereeMapper.xml

@@ -13,8 +13,8 @@
                u.alias,
                u.phone
         FROM shop_dealer_referee a
-        INNER JOIN gxwebsoft_core.sys_user d ON a.dealer_id = d.user_id AND d.deleted = 0
+        INNER JOIN websoft_core.sys_user d ON a.dealer_id = d.user_id AND d.deleted = 0
-        INNER JOIN gxwebsoft_core.sys_user u ON a.user_id = u.user_id AND u.deleted = 0
+        INNER JOIN websoft_core.sys_user u ON a.user_id = u.user_id AND u.deleted = 0
         <where>
             <if test="param.id != null">
                 AND a.id = #{param.id}

src/main/java/com/gxwebsoft/shop/mapper/xml/ShopDealerUserMapper.xml

@@ -6,7 +6,7 @@
     <sql id="selectSql">
         SELECT a.*, b.openid
         FROM shop_dealer_user a
-        LEFT JOIN gxwebsoft_core.sys_user b ON a.user_id = b.user_id
+        LEFT JOIN websoft_core.sys_user b ON a.user_id = b.user_id
         <where>
             <if test="param.id != null">
                 AND a.id = #{param.id}

src/main/java/com/gxwebsoft/shop/mapper/xml/ShopDealerWithdrawMapper.xml

@@ -6,8 +6,8 @@
     <sql id="selectSql">
         SELECT a.*, b.nickname, b.phone AS phone, b.avatar, c.real_name as realName
         FROM shop_dealer_withdraw a
-        LEFT JOIN gxwebsoft_core.sys_user b ON a.user_id = b.user_id
+        LEFT JOIN websoft_core.sys_user b ON a.user_id = b.user_id
-        LEFT JOIN gxwebsoft_core.sys_user_verify c ON a.user_id = c.user_id AND c.status = 1
+        LEFT JOIN websoft_core.sys_user_verify c ON a.user_id = c.user_id AND c.status = 1
         <where>
             <if test="param.id != null">
                 AND a.id = #{param.id}

src/main/java/com/gxwebsoft/shop/mapper/xml/ShopGiftMapper.xml

@@ -7,8 +7,8 @@
         SELECT a.*,b.name as goodsName, b.price as faceValue, b.image as goodsImage,c.nickname, u.nickname as operatorUserName
         FROM shop_gift a
         LEFT JOIN shop_goods b ON a.goods_id = b.goods_id
-        LEFT JOIN gxwebsoft_core.sys_user c ON a.user_id = c.user_id
+        LEFT JOIN websoft_core.sys_user c ON a.user_id = c.user_id
-        LEFT JOIN gxwebsoft_core.sys_user u ON a.operator_user_id = u.user_id
+        LEFT JOIN websoft_core.sys_user u ON a.operator_user_id = u.user_id
         <where>
             <if test="param.id != null">
                 AND a.id = #{param.id}

src/main/java/com/gxwebsoft/shop/mapper/xml/ShopOrderMapper.xml

@@ -6,7 +6,7 @@
     <sql id="selectSql">
         SELECT a.*,b.nickname, b.avatar,b.phone as phone
         FROM shop_order a
-        LEFT JOIN gxwebsoft_core.sys_user b ON a.user_id = b.user_id
+        LEFT JOIN websoft_core.sys_user b ON a.user_id = b.user_id
         <where>
             <if test="param.orderId != null">
                 AND a.order_id = #{param.orderId}

src/main/java/com/gxwebsoft/shop/mapper/xml/ShopUserRefereeMapper.xml

@@ -12,8 +12,8 @@
                u.avatar,
                u.phone
         FROM shop_user_referee a
-        LEFT JOIN gxwebsoft_core.sys_user d ON a.dealer_id = d.user_id
+        LEFT JOIN websoft_core.sys_user d ON a.dealer_id = d.user_id
-        LEFT JOIN gxwebsoft_core.sys_user u ON a.user_id = u.user_id
+        LEFT JOIN websoft_core.sys_user u ON a.user_id = u.user_id
         <where>
             <if test="param.id != null">
                 AND a.id = #{param.id}

src/main/resources/application-prod.yml

@@ -14,8 +14,8 @@ spring:
   # redis
   redis:
     database: 0
-    host: 1Panel-redis-Q1LE
+    host: 8.134.169.209
-    port: 6379
+    port: 16379
     password: redis_WSDb88
 
 # 日志配置

src/main/resources/application-test.yml

@@ -7,9 +7,9 @@ server:
 # 数据源配置
 spring:
   datasource:
-    url: jdbc:mysql://1Panel-mysql-Bqdt:3306/modules?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://47.121.133.163:3308/mp?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai
-    username: modules
+    username: mp
-    password: P7KsAyDXG8YdLnkA
+    password: BzDa2dzMACYjnsRD
     driver-class-name: com.mysql.cj.jdbc.Driver
     type: com.alibaba.druid.pool.DruidDataSource
     druid:
@@ -18,8 +18,8 @@ spring:
   # redis
   redis:
     database: 0
-    host: 1Panel-redis-Q1LE
+    host: 8.134.169.209
-    port: 6379
+    port: 16379
     password: redis_WSDb88
 
 # 日志配置