lyhzzz 2 năm trước cách đây
mục cha
commit
791b6c1115

+ 2 - 0
src/main/java/com/fdkankan/manage/vo/response/SceneVo.java

@@ -26,4 +26,6 @@ public class SceneVo {
     private Boolean isAuth = false;          //是否有授权按钮
     private Boolean isAuthOther = false;     //是否有授权其他人选项按钮
 
+    private String webSite;
+
 }

+ 2 - 2
src/main/resources/mapper/manage/SceneProMapper.xml

@@ -30,7 +30,7 @@
     <select id="pageList" resultType="com.fdkankan.manage.vo.response.SceneVo">
         SELECT * FROM(
         select s.scene_name ,s.num,s.create_time,c.sn_code,s.space as sceneSize
-        ,u.user_name,s.view_count,s.status,s.pay_status,'v3' as scene_version ,s.web_site as thumb
+        ,u.user_name,s.view_count,s.status,s.pay_status,'v3' as scene_version ,s.web_site , s.thumb
         ,null as algorithmTime,s.user_id
         from t_scene_pro s
         <include refid="commonWhere"></include>
@@ -40,7 +40,7 @@
         and is_upgrade = 0
         UNION
         select s.title as sceneName ,s.num,s.create_time,c.sn_code,e.space as sceneSize
-        ,u.user_name,e.view_count,s.scene_status as status,s.pay_status,'v4' as scene_version,e.web_site as thumb
+        ,u.user_name,e.view_count,s.scene_status as status,s.pay_status,'v4' as scene_version,e.web_site , s.thumb
         ,algorithm_time,s.user_id
         from t_scene_plus s
         left join t_scene_plus_ext e on s.id = e.plus_id

+ 0 - 13
src/test/java/com/fdkankan/manage/ManageApplicationTests.java

@@ -1,13 +0,0 @@
-package com.fdkankan.manage.test;
-
-import org.junit.jupiter.api.Test;
-import org.springframework.boot.test.context.SpringBootTest;
-
-@SpringBootTest
-class ManageApplicationTests {
-
-    @Test
-    void contextLoads() {
-    }
-
-}

+ 0 - 42
src/test/java/com/fdkankan/manage/test/Test1.java

@@ -1,42 +0,0 @@
-package com.fdkankan.manage.test;
-
-import com.alibaba.fastjson.JSONObject;
-import com.fdkankan.manage.common.ResultData;
-import com.fdkankan.manage.util.RsaUtils;
-import org.apache.http.HttpEntity;
-import org.apache.http.HttpResponse;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.entity.StringEntity;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClients;
-import org.apache.http.util.EntityUtils;
-import org.junit.jupiter.api.Test;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.io.IOException;
-
-public class Test1 {
-
-    @org.junit.jupiter.api.Test
-    public void test1() throws IOException {
-        String url = "http://192.168.0.25/service/manage/external/getByRyId";
-        JSONObject jsonObject = new JSONObject();
-        jsonObject.put("ryId","13800138001");
-        String encipher = RsaUtils.encipher(jsonObject.toJSONString());
-
-        HttpPost httpPost = new HttpPost(url);
-        CloseableHttpClient client = HttpClients.createDefault();
-        StringEntity entity = new StringEntity(encipher,"utf-8");//解决中文乱码问题
-        entity.setContentEncoding("utf-8");
-        entity.setContentType("application/json");
-        httpPost.setEntity(entity);
-        HttpResponse response = client.execute(httpPost);
-        if(response.getStatusLine().getStatusCode() == 200){
-            HttpEntity httpEntity = response.getEntity();
-            String result = EntityUtils.toString(httpEntity, "utf-8");
-            System.out.println(result);
-        }
-    }
-
-}