Merge remote-tracking branch 'origin/main'

ruoyi-admin/src/main/resources/application-hs.yml

@@ -6,6 +6,10 @@ spring:
     druid:
       # 主库数据源
       master:
+        #内网数据库
+        #url: jdbc:mysql://172.16.9.9:3306/szxc?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+        #username: root
+        #password: ruanfa
         url: jdbc:mysql://localhost:3307/szxc?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
         username: root
         password: hs123456

ruoyi-admin/src/main/resources/application-test.yml

@@ -6,6 +6,7 @@ spring:
         druid:
             # 主库数据源
             master:
+                #内网jenkins启动连接内网数据库szxc
                 url: jdbc:mysql://localhost:3306/szxc?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: ceshi
                 password: ruanfa

ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcNews.java

@@ -9,7 +9,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * 公告资讯对象 szxc_news
  *
  * @author hs
- * @date 2024-03-16
+ * @date 2024-04-03
  */
 public class SzxcNews extends BaseEntity
 {
@@ -22,8 +22,8 @@ public class SzxcNews extends BaseEntity
     @Excel(name = "标题")
     private String title;
 
-    /** 类型(公告/咨询) */
+    /** 类型(字典) */
-    @Excel(name = "类型(公告/咨询)")
+    @Excel(name = "类型(字典)")
     private String type;
 
     /** 图片 */
@@ -36,7 +36,7 @@ public class SzxcNews extends BaseEntity
 
     /** 级别(县/乡/村) */
     @Excel(name = "级别(县/乡/村)")
-    private String leave;
+    private String sort;
 
     /** 部门id */
     @Excel(name = "部门id")
@@ -95,14 +95,14 @@ public class SzxcNews extends BaseEntity
     {
         return content;
     }
-    public void setLeave(String leave) 
+    public void setSort(String sort)
     {
-        this.leave = leave;
+        this.sort = sort;
     }
 
-    public String getLeave() 
+    public String getSort()
     {
-        return leave;
+        return sort;
     }
     public void setDeptId(Long deptId)
     {
@@ -135,19 +135,19 @@ public class SzxcNews extends BaseEntity
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
+                .append("id", getId())
-            .append("title", getTitle())
+                .append("title", getTitle())
-            .append("type", getType())
+                .append("type", getType())
-            .append("picture", getPicture())
+                .append("picture", getPicture())
-            .append("content", getContent())
+                .append("content", getContent())
-            .append("leave", getLeave())
+                .append("sort", getSort())
-            .append("createBy", getCreateBy())
+                .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
+                .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
+                .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
+                .append("updateTime", getUpdateTime())
-            .append("deptId", getDeptId())
+                .append("deptId", getDeptId())
-            .append("deptName", getDeptName())
+                .append("deptName", getDeptName())
-            .append("userId", getUserId())
+                .append("userId", getUserId())
-            .toString();
+                .toString();
     }
 }

ruoyi-szxc/src/main/resources/mapper/szxc/SzxcNewsMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.szxc.mapper.SzxcNewsMapper">
 
     <resultMap type="SzxcNews" id="SzxcNewsResult">
@@ -10,7 +10,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="type"    column="type"    />
         <result property="picture"    column="picture"    />
         <result property="content"    column="content"    />
-        <result property="leave"    column="leave"    />
+        <result property="sort"    column="sort"    />
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
         <result property="updateBy"    column="update_by"    />
@@ -21,7 +21,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectSzxcNewsVo">
-        select id, title, type, picture, content, leave, create_by, create_time, update_by, update_time, dept_id, dept_name, user_id from szxc_news
+        select id, title, type, picture, content, sort, create_by, create_time, update_by, update_time, dept_id, dept_name, user_id from szxc_news
     </sql>
 
     <select id="selectSzxcNewsList" parameterType="SzxcNews" resultMap="SzxcNewsResult">
@@ -31,7 +31,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="type != null  and type != ''"> and type = #{type}</if>
             <if test="picture != null  and picture != ''"> and picture = #{picture}</if>
             <if test="content != null  and content != ''"> and content = #{content}</if>
-            <if test="leave != null  and leave != ''"> and leave = #{leave}</if>
+            <if test="sort != null  and sort != ''"> and sort = #{sort}</if>
             <if test="deptId != null "> and dept_id = #{deptId}</if>
             <if test="deptName != null  and deptName != ''"> and dept_name like concat('%', #{deptName}, '%')</if>
             <if test="userId != null "> and user_id = #{userId}</if>
@@ -50,7 +50,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="type != null">type,</if>
             <if test="picture != null">picture,</if>
             <if test="content != null">content,</if>
-            <if test="leave != null">leave,</if>
+            <if test="sort != null">sort,</if>
             <if test="createBy != null">create_by,</if>
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null">update_by,</if>
@@ -58,13 +58,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deptId != null">dept_id,</if>
             <if test="deptName != null">dept_name,</if>
             <if test="userId != null">user_id,</if>
-         </trim>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="title != null and title != ''">#{title},</if>
             <if test="type != null">#{type},</if>
             <if test="picture != null">#{picture},</if>
             <if test="content != null">#{content},</if>
-            <if test="leave != null">#{leave},</if>
+            <if test="sort != null">#{sort},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
@@ -72,7 +72,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deptId != null">#{deptId},</if>
             <if test="deptName != null">#{deptName},</if>
             <if test="userId != null">#{userId},</if>
-         </trim>
+        </trim>
     </insert>
 
     <update id="updateSzxcNews" parameterType="SzxcNews">
@@ -82,7 +82,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="type != null">type = #{type},</if>
             <if test="picture != null">picture = #{picture},</if>
             <if test="content != null">content = #{content},</if>
-            <if test="leave != null">leave = #{leave},</if>
+            <if test="sort != null">sort = #{sort},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>

ruoyi-ui/vue.config.js

@@ -36,6 +36,7 @@ module.exports = {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
         target: `http://localhost:8090`,
+        //target: `http://172.16.9.9:8090`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''