伊宁项目更改相关 统一app相关 增加升级app转发接口

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java

@@ -7,7 +7,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.exception.user.*;
-import com.ruoyi.common.json.JSON;
+import com.ruoyi.common.utils.http.HttpUtil;
 import com.ruoyi.framework.shiro.service.SysLoginService;
 import com.ruoyi.system.domain.Dangan;
 import com.ruoyi.system.domain.UserRelate;
@@ -276,4 +276,35 @@ public class SysLoginController extends BaseController
     {
         return "error/unauth";
     }
+
+    @Value("${kpr.base.appinfo}")
+    private String appinfoUrl;
+
+    /**
+     * @Author Lx
+     * @Description //TODO 升级APP
+     * @Date 17:31 2023/11/10
+     * @Param
+     * @return
+     **/
+    @PostMapping("/upApp")
+    @ResponseBody
+    public AjaxResult upApp(String appId,String userId) {
+        try {
+            if(StringUtils.isEmpty(userId)){
+                return error("登录信息未找到");
+            }
+            if(StringUtils.isEmpty(appId)){
+                return error("应用id未传");
+            }
+            String resJson = HttpUtil.getJson(appinfoUrl+"?appid="+appId);
+            if(StringUtils.isEmpty(resJson)){
+                return error("升级请求失败");
+            }
+            return success(resJson);
+        }catch(Exception ex){
+            logger.error(ex.getMessage());
+            return error();
+        }
+    }
 }

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

@@ -109,4 +109,5 @@ spring:
         restart:
           # 热部署开关
           enabled: true
-yiningCodeUrl: https://140.246.183.164:9000/base/apply/apk
+yiningCodeUrl: https://140.246.183.164:9000/base/apply/apk
+kpr.base.appinfo: https://119.96.165.176:9090/base/apply/apk-pkg

ruoyi-admin/src/main/resources/static/aliicon/demo_index.html

@@ -55,6 +55,48 @@
           <ul class="icon_lists dib-box">
           
             <li class="dib">
+              <span class="icon iconfont">&#xe70a;</span>
+                <div class="name">用水</div>
+                <div class="code-name">&amp;#xe70a;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe622;</span>
+                <div class="name">-yibiaopan</div>
+                <div class="code-name">&amp;#xe622;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe64b;</span>
+                <div class="name">巡检管理</div>
+                <div class="code-name">&amp;#xe64b;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe644;</span>
+                <div class="name">预警</div>
+                <div class="code-name">&amp;#xe644;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe7b5;</span>
+                <div class="name">gis图层</div>
+                <div class="code-name">&amp;#xe7b5;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe62a;</span>
+                <div class="name">维修</div>
+                <div class="code-name">&amp;#xe62a;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe7a8;</span>
+                <div class="name">防洪调度_1</div>
+                <div class="code-name">&amp;#xe7a8;</div>
+              </li>
+          
+            <li class="dib">
               <span class="icon iconfont">&#xe670;</span>
                 <div class="name">icon_q&a</div>
                 <div class="code-name">&amp;#xe670;</div>
@@ -810,9 +852,9 @@
 <pre><code class="language-css"
 >@font-face {
   font-family: 'iconfont';
-  src: url('iconfont.woff2?t=1699500449017') format('woff2'),
-       url('iconfont.woff?t=1699500449017') format('woff'),
-       url('iconfont.ttf?t=1699500449017') format('truetype');
+  src: url('iconfont.woff2?t=1699608096871') format('woff2'),
+       url('iconfont.woff?t=1699608096871') format('woff'),
+       url('iconfont.ttf?t=1699608096871') format('truetype');
 }
 </code></pre>
           <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
@@ -839,6 +881,69 @@
         <ul class="icon_lists dib-box">
           
           <li class="dib">
+            <span class="icon iconfont iconyongshui"></span>
+            <div class="name">
+              用水
+            </div>
+            <div class="code-name">.iconyongshui
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont iconspeed-meter"></span>
+            <div class="name">
+              -yibiaopan
+            </div>
+            <div class="code-name">.iconspeed-meter
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont iconxunjianguanli"></span>
+            <div class="name">
+              巡检管理
+            </div>
+            <div class="code-name">.iconxunjianguanli
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont iconyujing"></span>
+            <div class="name">
+              预警
+            </div>
+            <div class="code-name">.iconyujing
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icongistuceng"></span>
+            <div class="name">
+              gis图层
+            </div>
+            <div class="code-name">.icongistuceng
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont iconweixiu1"></span>
+            <div class="name">
+              维修
+            </div>
+            <div class="code-name">.iconweixiu1
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont iconfanghongtiaodu_1"></span>
+            <div class="name">
+              防洪调度_1
+            </div>
+            <div class="code-name">.iconfanghongtiaodu_1
+            </div>
+          </li>
+          
+          <li class="dib">
             <span class="icon iconfont icona-icon_qa"></span>
             <div class="name">
               icon_q&a
@@ -1974,6 +2079,62 @@
           
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#iconyongshui"></use>
+                </svg>
+                <div class="name">用水</div>
+                <div class="code-name">#iconyongshui</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#iconspeed-meter"></use>
+                </svg>
+                <div class="name">-yibiaopan</div>
+                <div class="code-name">#iconspeed-meter</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#iconxunjianguanli"></use>
+                </svg>
+                <div class="name">巡检管理</div>
+                <div class="code-name">#iconxunjianguanli</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#iconyujing"></use>
+                </svg>
+                <div class="name">预警</div>
+                <div class="code-name">#iconyujing</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icongistuceng"></use>
+                </svg>
+                <div class="name">gis图层</div>
+                <div class="code-name">#icongistuceng</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#iconweixiu1"></use>
+                </svg>
+                <div class="name">维修</div>
+                <div class="code-name">#iconweixiu1</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#iconfanghongtiaodu_1"></use>
+                </svg>
+                <div class="name">防洪调度_1</div>
+                <div class="code-name">#iconfanghongtiaodu_1</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icona-icon_qa"></use>
                 </svg>
                 <div class="name">icon_q&a</div>

ruoyi-admin/src/main/resources/static/aliicon/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 3257556 */
-  src: url('iconfont.woff2?t=1699500449017') format('woff2'),
-       url('iconfont.woff?t=1699500449017') format('woff'),
-       url('iconfont.ttf?t=1699500449017') format('truetype');
+  src: url('iconfont.woff2?t=1699608096871') format('woff2'),
+       url('iconfont.woff?t=1699608096871') format('woff'),
+       url('iconfont.ttf?t=1699608096871') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,34 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.iconyongshui:before {
+  content: "\e70a";
+}
+
+.iconspeed-meter:before {
+  content: "\e622";
+}
+
+.iconxunjianguanli:before {
+  content: "\e64b";
+}
+
+.iconyujing:before {
+  content: "\e644";
+}
+
+.icongistuceng:before {
+  content: "\e7b5";
+}
+
+.iconweixiu1:before {
+  content: "\e62a";
+}
+
+.iconfanghongtiaodu_1:before {
+  content: "\e7a8";
+}
+
 .icona-icon_qa:before {
   content: "\e670";
 }

ruoyi-admin/src/main/resources/static/aliicon/iconfont.json

@@ -6,6 +6,55 @@
   "description": "",
   "glyphs": [
     {
+      "icon_id": "19478500",
+      "name": "用水",
+      "font_class": "yongshui",
+      "unicode": "e70a",
+      "unicode_decimal": 59146
+    },
+    {
+      "icon_id": "33678943",
+      "name": "-yibiaopan",
+      "font_class": "speed-meter",
+      "unicode": "e622",
+      "unicode_decimal": 58914
+    },
+    {
+      "icon_id": "11875502",
+      "name": "巡检管理",
+      "font_class": "xunjianguanli",
+      "unicode": "e64b",
+      "unicode_decimal": 58955
+    },
+    {
+      "icon_id": "4988542",
+      "name": "预警",
+      "font_class": "yujing",
+      "unicode": "e644",
+      "unicode_decimal": 58948
+    },
+    {
+      "icon_id": "10465903",
+      "name": "gis图层",
+      "font_class": "gistuceng",
+      "unicode": "e7b5",
+      "unicode_decimal": 59317
+    },
+    {
+      "icon_id": "21652026",
+      "name": "维修",
+      "font_class": "weixiu1",
+      "unicode": "e62a",
+      "unicode_decimal": 58922
+    },
+    {
+      "icon_id": "26709651",
+      "name": "防洪调度_1",
+      "font_class": "fanghongtiaodu_1",
+      "unicode": "e7a8",
+      "unicode_decimal": 59304
+    },
+    {
       "icon_id": "37861243",
       "name": "icon_q&a",
       "font_class": "a-icon_qa",

ruoyi-admin/src/main/resources/templates/system/dangan/icon.html

@@ -22,15 +22,19 @@
 </head>
 <body>
 <div class="ico-list">
-     <i class="icon iconfont icona-icon_qa"></i>
+     <i class="icon iconfont iconyongshui"></i>
 
-     <i class="icon iconfont iconicon_picture"></i>
+     <i class="icon iconfont iconspeed-meter"></i>
 
-     <i class="icon iconfont iconicon_mapmark"></i>
+     <i class="icon iconfont iconxunjianguanli"></i>
 
-     <i class="icon iconfont iconicon_closeup"></i>
+     <i class="icon iconfont iconyujing"></i>
 
-     <i class="icon iconfont iconicon_location"></i>
+     <i class="icon iconfont icongistuceng"></i>
+
+     <i class="icon iconfont iconweixiu1"></i>
+
+     <i class="icon iconfont iconfanghongtiaodu_1"></i>
 
 </div>
 </body>

ruoyi-common/pom.xml

@@ -101,6 +101,11 @@
             <artifactId>javax.servlet-api</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+            <version>4.5.2</version>
+        </dependency>
     </dependencies>
 
 </project>

ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpUtil.java

@@ -0,0 +1,152 @@
+package com.ruoyi.common.utils.http;
+
+import com.alibaba.fastjson.JSONObject;
+
+import org.apache.http.HttpEntity;
+import org.apache.http.client.config.RequestConfig;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.client.utils.URIBuilder;
+import org.apache.http.conn.ssl.NoopHostnameVerifier;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.message.BasicHeader;
+import org.apache.http.protocol.HTTP;
+import org.apache.http.ssl.SSLContexts;
+import org.apache.http.ssl.TrustStrategy;
+import org.apache.http.util.EntityUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.net.ssl.SSLContext;
+import java.io.BufferedReader;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.security.KeyManagementException;
+import java.security.KeyStoreException;
+import java.security.NoSuchAlgorithmException;
+import java.security.cert.CertificateException;
+import java.security.cert.X509Certificate;
+
+/**
+ * @ClassName HttpUtil
+ * @Description: TODO
+ * @Author LX
+ * @Date 2023/6/19
+ * @Version V1.0
+ **/
+public class HttpUtil {
+
+    private final static String mStrClassName = "HttpUtil";
+
+    private final static Logger logger = LoggerFactory.getLogger(HttpUtil.class);
+
+    public static String postJosn(JSONObject jsonObject, String url){
+        try {
+            String body = "";
+//创建httpclient对象
+            CloseableHttpClient client = HttpClients.createDefault();
+            RequestConfig requestConfig = RequestConfig.custom()
+                    .setConnectionRequestTimeout(20000)
+                    .setSocketTimeout(10000)
+                    .setConnectTimeout(20000).build();
+//创建post方式请求对象
+            HttpPost httpPost = new HttpPost(url);
+            httpPost.setConfig(requestConfig);
+//装填参数
+// jsonObject 是需要封装的参数
+            System.out.println("http:"+jsonObject.toJSONString());
+            StringEntity s = new StringEntity(jsonObject.toString(), "utf-8");
+            s.setContentEncoding(new BasicHeader(HTTP.CONTENT_TYPE, "application/json"));
+//设置参数到请求对象中
+            httpPost.setEntity(s);
+//设置header信息
+//指定报文头【Content-type】、【User-Agent】
+//httpPost.setHeader("Content-type", "application/x-www-form-urlencoded");
+            httpPost.setHeader("Content-type", "application/json");
+            httpPost.setHeader("User-Agent", "Mozilla/4.0 (compatible; MSIE 5.0; Windows NT; DigExt)");
+//执行请求操作，并拿到结果（同步阻塞）
+            CloseableHttpResponse response = client.execute(httpPost);
+//获取结果实体
+            HttpEntity entity = response.getEntity();
+            if (entity != null) {
+//按指定编码转换结果实体为String类型
+                body = EntityUtils.toString(entity, "utf-8");
+            }
+            EntityUtils.consume(entity);
+//释放链接
+            response.close();
+            return body;
+        }catch(Exception ex){
+            return "";
+        }
+    }
+
+    public static String getJson(String url) {
+        logger.info("=====================HTTP GET 请求参数 url=" + url);
+        InputStream is = null;
+        String body = null;
+        StringBuilder res = new StringBuilder();
+        // 实例化CloseableHttpClient
+//        CloseableHttpClient client = HttpClients.createDefault();
+        CloseableHttpClient client = getScontractHttpClient();
+        CloseableHttpResponse response = null;
+        try {
+            // 添加URL和请求参数
+            //替换空格;get请求，url拼接参数时，参数值可能存在空格，需要对空格做处理，不然接口会调不通
+            url = url.replaceAll(" ", "%20");
+            URIBuilder ub = new URIBuilder(url);
+            // 使用get方法添加URL
+            HttpGet get = new HttpGet(ub.build());
+            // 设置请求超时时间
+            RequestConfig config = RequestConfig.custom().setConnectTimeout(1500).build();
+            get.setConfig(config);
+            //使用http调用远程，获取相应信息
+            response = client.execute(get);
+            // 获取响应状态码，可根据是否响应正常来判断是否需要进行下一步
+            int statusCode = response.getStatusLine().getStatusCode();
+            if (statusCode != 200) {
+                return "请求失败 statusCode=" + statusCode;
+            }
+            // 获取响应实体
+            HttpEntity entity = response.getEntity();
+            // 读取响应内容
+            if (entity != null) {
+                is = entity.getContent();
+                BufferedReader br = new BufferedReader(new InputStreamReader(is, "UTF-8"));
+                while ((body = br.readLine()) != null) {
+                    res.append(body);
+                }
+            }
+        } catch (Exception e) {
+            logger.error(e.getMessage());
+        }
+        logger.info("=====================HTTP GET 请求响应参数 result=" + res.toString());
+        return res.toString();
+    }
+
+    //TODO 跳过HTTPS检查
+    public static CloseableHttpClient getScontractHttpClient() {
+        SSLContext sslContext = null;
+        try {
+            sslContext = SSLContexts.custom().loadTrustMaterial(null, new TrustStrategy() {
+                @Override
+                public boolean isTrusted(X509Certificate[] x509Certificates, String s) throws CertificateException {
+                    return true;
+                }
+            }).build();
+        } catch (NoSuchAlgorithmException e) {
+            e.printStackTrace();
+        } catch (KeyManagementException e) {
+            e.printStackTrace();
+        } catch (KeyStoreException e) {
+            e.printStackTrace();
+        }
+        //创建httpClient
+        return HttpClients.custom().setSSLContext(sslContext).
+                setSSLHostnameVerifier(new NoopHostnameVerifier()).build();
+
+    }
+}

ruoyi-framework/src/main/java/com/ruoyi/framework/config/ShiroConfig.java

@@ -298,6 +298,7 @@ public class ShiroConfig
         // 不需要拦截的访问
         filterChainDefinitionMap.put("/login", "anon,captchaValidate");
         filterChainDefinitionMap.put("/loginApp", "anon,captchaValidate");
+        filterChainDefinitionMap.put("/upApp", "anon,captchaValidate");
         // 注册相关
         filterChainDefinitionMap.put("/register", "anon,captchaValidate");
         // 系统权限列表