首页图标配置

suishenbang-admin/src/main/resources/application-uat.yml

@@ -9,7 +9,7 @@ ruoyi:
   # 实例演示开关
   demoEnabled: true
   # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
-#  profile: /home/admin/project/file
+  #profile: /home/admin/project/file
   profile: D:/ruoyi/uploadPath
   # 获取ip地址开关
   addressEnabled: false
@@ -48,7 +48,7 @@ qiyeweixin:
 # 开发环境配置
 server:
   # 服务器的HTTP端口，默认为80
-  port: 10000
+  port: 8083
   servlet:
     # 应用的访问路径
     context-path: /oneportal
@@ -58,7 +58,7 @@ server:
     # tomcat最大线程数，默认为200
     max-threads: 800
     # Tomcat启动初始化的线程数，默认值25
-    min-spare-threads: 30
+    min-spare-threads: 50
     basedir: /tmp/tomcat
 
 # 日志配置
@@ -109,7 +109,7 @@ spring:
     #邮件服务器地址
     host: mail.dgtis.com
     #端口号
-    port: 10002
+    port: 25
     #发送者邮箱地址
     username: dgtmail@dgtis.com
     #邮箱的授权码

suishenbang-wxportal/suishenbang-wxportal-common/src/main/java/com/dgtly/wxportal/domain/HomeIconConfig.java

@@ -12,6 +12,6 @@ public class HomeIconConfig extends BaseEntity
     private  String activity_icon_endtime;
     private  String bottom_prompt_text;
     private  String prompt_text_color;
-    private  String activity_icon_extra;
+    private  String  activity_icon_extra;
 
 }

suishenbang-wxportal/suishenbang-wxportal-common/src/main/java/com/dgtly/wxportal/service/IWxMagnetService.java

@@ -6,6 +6,7 @@ import com.dgtly.system.domain.SysRole;
 import com.dgtly.system.domain.SysUser;
 import com.dgtly.wxportal.domain.HomeIconConfig;
 import com.dgtly.wxportal.domain.WxMagnet;
+import com.fasterxml.jackson.core.JsonProcessingException;
 
 import java.awt.*;
 import java.util.List;
@@ -115,5 +116,5 @@ public interface IWxMagnetService
 
     void updateHomeIcon(HomeIconConfig homeIconConfig);
 
-    Map<String, Object> selectHomeIconInfoById();
+    Map<String, Object> selectHomeIconInfoById() throws JsonProcessingException;
 }

suishenbang-wxportal/suishenbang-wxportal-common/src/main/java/com/dgtly/wxportal/service/impl/WxMagnetServiceImpl.java

@@ -14,6 +14,7 @@ import com.dgtly.wxportal.domain.WxMagnet;
 import com.dgtly.wxportal.mapper.WxMagnetMapper;
 import com.dgtly.wxportal.service.IWxMagnetService;
 
+import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.slf4j.Logger;
@@ -325,7 +326,7 @@ public class WxMagnetServiceImpl implements IWxMagnetService
     }
 
     @Override
-    public Map<String, Object> selectHomeIconInfoById() {
+    public Map<String, Object> selectHomeIconInfoById() throws JsonProcessingException {
         List<Map<String,Object>> iconInfos=jdbcTemplate.queryForList("select * from system_home_config ");
         Map<String,Object> iconInfo= iconInfos.size()!=0?iconInfos.get(0):null;
         if(iconInfo!=null) {
@@ -337,8 +338,12 @@ public class WxMagnetServiceImpl implements IWxMagnetService
                 iconInfo.remove("small_icon_extra");
             }
             if (StringUtils.isNotBlank(activityIconString)) {
-                Map mapType = JSON.parseObject(activityIconString, Map.class);
-                iconInfo.put("activityIconObject", mapType);
+
+                ObjectMapper mapper = new ObjectMapper();
+
+                    String[] array = mapper.readValue(activityIconString, String[].class);
+
+                iconInfo.put("activityIconObject", array);
                 iconInfo.remove("activity_icon_extra");
             }
             return iconInfo;

suishenbang-wxportal/suishenbang-wxportal-manager/src/main/resources/templates/wxportal/magnet/themeAdd.html

@@ -151,7 +151,7 @@
 <th:block th:include="include :: cropbox-js"/>
 <script type="text/javascript">
     var prefix = ctx + "system/configuration"
-    var prefixEdit = "http://localhost:10000/oneportal/wxportal/magnet"
+    var prefixEdit = "http://localhost:8083/oneportal/wxportal/magnet"
     // var getCompanyListPrefix = "http://localhost:10001/wxportal-api/sysuser/searchOrg";
     var getCompanyListPrefix = "https://suishenbangtest.nipponpaint.com.cn/wxportal-api/sysuser/searchOrg";
 
@@ -269,6 +269,7 @@
                 var configSubmit = {
                     url: prefixEdit + "/editHome",
                     type: "post",
+                    contentType: "application/json ; charset=utf-8",
                     dataType: "json",
                     data: objSubmit,
                     beforeSend: function () {