Browse Source

mq模块配置

raojiang 6 months ago
parent
commit
78d86c7451

+ 12 - 12
services/load-transfer-bf/src/main/resources/mapper/SystemThemeMapper.xml

@@ -8,10 +8,10 @@
         UPDATE USER_SYS_COLOR usc
         SET usc.SYSTEM_COLOR =
             (SELECT
-                sds.`VALUE`
-            FROM SYS_DICT_TYPE sdt
-            LEFT JOIN SYS_DICT_SINGLE sds ON sdt.TYPE_ID = sds.TYPE_ID
-            WHERE sdt.TYPE_NAME = 'system_color' AND sds.SORT = #{param})
+                 sdd.dict_value
+            FROM sys_dict_type sdt
+            LEFT JOIN sys_dict_data sdd ON sdt.dict_type = sdd.dict_type
+            WHERE sdt.dict_name = 'system_color' AND sdd.dict_sort = #{param})
         WHERE usc.USER_ID = #{userId}
     </update>
 
@@ -20,22 +20,22 @@
     </select>
     <select id="getThemeColorSort" resultType="java.lang.Integer">
         SELECT
-            sds.SORT
+            sdd.dict_sort
         FROM
-            SYS_DICT_TYPE sdt
+            sys_dict_type sdt
         LEFT JOIN
-            SYS_DICT_SINGLE sds ON sdt.TYPE_ID = sds.TYPE_ID
+            sys_dict_data sdd ON sdt.dict_type = sdd.dict_type
         INNER JOIN
-            USER_SYS_COLOR usc ON usc.SYSTEM_COLOR =sds.`VALUE`
-        WHERE sdt.TYPE_NAME = 'system_color' AND usc.USER_ID = #{userId}
+            USER_SYS_COLOR usc ON usc.SYSTEM_COLOR =sdd.dict_value
+        WHERE sdt.dict_name = 'system_color' AND usc.USER_ID = #{userId}
     </select>
 
     <select id="getAllSort" resultType="java.lang.Integer">
         SELECT
             COUNT(1)
-        FROM SYS_DICT_TYPE sdt
+        FROM sys_dict_type sdt
         LEFT JOIN
-            SYS_DICT_SINGLE sds on sdt.TYPE_ID = sds.TYPE_ID
-        WHERE sdt.TYPE_NAME = 'system_color'
+            sys_dict_data sdd on sdt.dict_type = sdd.dict_type
+        WHERE sdt.dict_name = 'system_color'
     </select>
 </mapper>

+ 2 - 2
services/load-transfer-mq/src/main/java/com/hdkj/lt/mq/LoadTransferMQApplication.java

@@ -5,9 +5,9 @@ import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cache.annotation.EnableCaching;
-import org.springframework.cloud.client.circuitbreaker.EnableCircuitBreaker;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.cloud.openfeign.EnableFeignClients;
+import springfox.documentation.swagger2.annotations.EnableSwagger2WebMvc;
 
 /**
  * @Description:
@@ -20,7 +20,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
 @SpringBootApplication(scanBasePackages = {SystemGlobalConstant.HUSSAR_BASE_PACKAGE, SystemGlobalConstant.BIZMS_BASE_PACKAGE})
 @MapperScan(basePackages = {SystemGlobalConstant.HUSSAR_DAO_PACKAGE, SystemGlobalConstant.BIZMS_DAO_PACKAGE, SystemGlobalConstant.BIZMS_MAPPER_PACKAGE})
 @EnableCaching
-@EnableCircuitBreaker
+@EnableSwagger2WebMvc
 public class LoadTransferMQApplication {
 
     public static void main(String[] args) {

+ 4 - 6
services/load-transfer-mq/src/main/resources/config/local/bootstrap-local.yml

@@ -2,7 +2,7 @@
 NACOS_HOST: 27.54.100.176
 NACOS_PORT: 18848
 NACOS_PWD: FHZG@nacos2025
-NAMESPACE: 682eb787-7279-47d8-8516-79b521f96690
+NAMESPACE: 88b0baca-b7b1-496c-8ebd-bbfea7959c49
 
 server:
   servlet:
@@ -32,9 +32,7 @@ spring:
         username: ${spring.cloud.nacos.discovery.username}
         password: ${spring.cloud.nacos.discovery.password}
         namespace: ${spring.cloud.nacos.discovery.namespace}
-        file-extension: yml
+        file-extension: yaml
         shared-configs:
-          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} #公共配置
-          - datasource-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}  #数据源配置
-          - hussar-common-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} #轻骑兵框架配置
-          - load-transfer-custom-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} #负荷转供系统自定义配置
+          - application.${spring.cloud.nacos.config.file-extension} #公共配置
+          - datasource.${spring.cloud.nacos.config.file-extension}  #数据源配置

+ 0 - 0
services/load-transfer-mq/src/main/resources/log4j2.xml → services/load-transfer-mq/src/main/resources/log4j2.xml.bak


+ 6 - 0
services/pom.xml

@@ -187,6 +187,12 @@
                     <include>mapper/*.xml</include>
                 </includes>
             </resource>
+            <resource>
+                <directory>src/main/java</directory>
+                <includes>
+                    <include>com/hdkj/**/mapping/*.xml</include>
+                </includes>
+            </resource>
             <resource>
                 <!-- 模板打包到template -->
                 <directory>src/main/resources/template</directory>