fix 经过ps图片格式问题

ruoyi-admin/pom.xml

@@ -16,6 +16,18 @@
     </description>
 
     <dependencies>
+        <!--twelvemonkeys cmyk格式图片转换-->
+
+        <dependency>
+            <groupId>com.twelvemonkeys.imageio</groupId>
+            <artifactId>imageio-jpeg</artifactId>
+            <version>3.3.2</version>
+        </dependency>
+        <dependency>
+            <groupId>com.twelvemonkeys.imageio</groupId>
+            <artifactId>imageio-tiff</artifactId>
+            <version>3.3</version>
+        </dependency>
 
         <!--thumbnailator生成缩略图-->
         <dependency>

ruoyi-system/src/main/java/com/ruoyi/system/mapper/ZbGalleryMapper.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.system.domain.grallery.ZbGallery;
 import com.ruoyi.system.dto.GalleryDto;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
 

ruoyi-system/src/main/resources/mapper/system/ZbGalleryMapper.xml

@@ -36,39 +36,39 @@
         JOIN zb_gallery_category zgc on zgc.id = zg.category_id
         <where>
             <if test="obj != null">
-                <if test="obj.name != null  and obj.name != ''">
-                    and zg.name like concat('%', #{obj.name}, '%')
-                </if>
-                <if test="obj.cnName != null  and obj.cnName != ''">
-                    and zg.cn_name like concat('%', #{obj.cnName}, '%')
-                </if>
-                <if test="obj.ptName != null  and obj.ptName != ''">
-                    and zg.pt_name like concat('%', #{obj.ptName}, '%')
-                </if>
-                <if test="obj.latinName != null  and obj.latinName != ''">
-                    and zg.latin_name like concat('%', #{obj.latinName}, '%')
-                </if>
-                <if test="obj.distribution != null  and obj.distribution != ''">
-                    and zg.distribution = #{obj.distribution}
-                </if>
-                <if test="obj.host != null  and obj.host != ''">
-                    and zg.host = #{obj.host}
-                </if>
-                <if test="obj.form != null  and obj.form != ''">
-                    and zg.form = #{obj.form}
-                </if>
-                <if test="obj.symptom != null  and obj.symptom != ''">
-                    and zg.symptom = #{obj.symptom}
-                </if>
-                <if test="obj.category != null  and obj.category != ''">
-                    and zg.category = #{obj.category}
-                </if>
-                <if test="obj.categoryId != null ">
-                    and zg.category_id = #{obj.categoryId}
-                </if>
+            <if test="obj.name != null  and obj.name != ''">
+                and zg.name like concat('%', #{obj.name}, '%')
             </if>
+            <if test="obj.cnName != null  and obj.cnName != ''">
+                and zg.cn_name like concat('%', #{obj.cnName}, '%')
+            </if>
+            <if test="obj.ptName != null  and obj.ptName != ''">
+                and zg.pt_name like concat('%', #{obj.ptName}, '%')
+            </if>
+            <if test="obj.latinName != null  and obj.latinName != ''">
+                and zg.latin_name like concat('%', #{obj.latinName}, '%')
+            </if>
+            <if test="obj.distribution != null  and obj.distribution != ''">
+                and zg.distribution = #{obj.distribution}
+            </if>
+            <if test="obj.host != null  and obj.host != ''">
+                and zg.host = #{obj.host}
+            </if>
+            <if test="obj.form != null  and obj.form != ''">
+                and zg.form = #{obj.form}
+            </if>
+            <if test="obj.symptom != null  and obj.symptom != ''">
+                and zg.symptom = #{obj.symptom}
+            </if>
+            <if test="obj.category != null  and obj.category != ''">
+                and zg.category = #{obj.category}
+            </if>
+            <if test="obj.categoryId != null ">
+                and zg.category_id = #{obj.categoryId}
+            </if>
+        </if>
         </where>
-        order by zg.category DESC, zg.sort, zg.latin_name is null, zg.latin_name, CONVERT(zg.cn_name USING gbk)
+        order by zg.category DESC, zg.sort, zg.latin_name is null, zg.latin_name, CONVERT(zg.cn_name using gb2312)
     </select>
 
     <resultMap id="GalleryDtoMap" type="com.ruoyi.system.dto.GalleryDto">

ruoyi-ui/src/settings.js

@@ -28,6 +28,6 @@ module.exports = {
    * If you want to also use it in dev, you can pass ['production', 'development']
    */
   errorLog: 'production',
-  // apiUrl: 'http://192.168.101.11:8080'
-  apiUrl: 'http://36.7.89.102:8080'
+   apiUrl: 'http://192.168.101.11:8080'
+  //apiUrl: 'http://36.7.89.102:8080'
 }

ruoyi-ui/vue.config.js

@@ -35,8 +35,8 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        target: `http://36.7.89.102:8080`,
-        // target: `http://192.168.101.11:8080`,
+        //target: `http://36.7.89.102:8080`,
+         target: `http://192.168.101.11:8080`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''