5 years ago · 0552fa850d
--- a/src/main/java/com/yingying/tourist/domain/Config.java
+++ b/src/main/java/com/yingying/tourist/domain/Config.java
@@ -0,0 +1,10 @@
 
				+package com.yingying.tourist.domain;
			
 
				+
			
 
				+import lombok.Data;
			
 
				+
			
 
				+@Data
			
 
				+public class Config {
			
 
				+
			
 
				+    private String configKey;
			
 
				+    private String configValue;
			
 
				+}
			
--- a/src/main/java/com/yingying/tourist/domain/Question.java
+++ b/src/main/java/com/yingying/tourist/domain/Question.java
@@ -10,4 +10,5 @@ public class Question {
 
				     private String resultDestination;

			
 
				     private String resultOutter;

			
 
				     private String resultInner;

			
 
				+    private String resultUrl;

			
 
				 }

			
--- a/src/main/java/com/yingying/tourist/mapper/ConfigMapper.java
+++ b/src/main/java/com/yingying/tourist/mapper/ConfigMapper.java
@@ -0,0 +1,7 @@
 
				+package com.yingying.tourist.mapper;
			
 
				+
			
 
				+import com.baomidou.mybatisplus.mapper.BaseMapper;
			
 
				+import com.yingying.tourist.domain.Config;
			
 
				+
			
 
				+public interface ConfigMapper extends BaseMapper<Config> {
			
 
				+}
			
--- a/src/main/java/com/yingying/tourist/service/ConfigService.java
+++ b/src/main/java/com/yingying/tourist/service/ConfigService.java
@@ -0,0 +1,7 @@
 
				+package com.yingying.tourist.service;
			
 
				+
			
 
				+import com.baomidou.mybatisplus.service.IService;
			
 
				+import com.yingying.tourist.domain.Config;
			
 
				+
			
 
				+public interface ConfigService extends IService<Config> {
			
 
				+}
			
--- a/src/main/java/com/yingying/tourist/service/impl/ConfigServiceImpl.java
+++ b/src/main/java/com/yingying/tourist/service/impl/ConfigServiceImpl.java
@@ -0,0 +1,10 @@
 
				+package com.yingying.tourist.service.impl;
			
 
				+
			
 
				+import com.yingying.tourist.domain.Config;
			
 
				+import com.yingying.tourist.mapper.ConfigMapper;
			
 
				+import com.yingying.tourist.service.ConfigService;
			
 
				+import org.springframework.stereotype.Service;
			
 
				+
			
 
				+@Service
			
 
				+public class ConfigServiceImpl extends BaseServiceImpl<ConfigMapper, Config> implements ConfigService {
			
 
				+}
			
--- a/src/main/java/com/yingying/tourist/vo/QuestionVo.java
+++ b/src/main/java/com/yingying/tourist/vo/QuestionVo.java
@@ -11,4 +11,6 @@ public class QuestionVo {
 
				     private String resultInner;

			
 
				     private String resultIdentity;

			
 
				     private String resultDescribe;

			
 
				+    private String resultUrl;

			
 
				+    private Boolean show;

			
 
				 }

			
--- a/src/main/java/com/yingying/tourist/web/QuestionController.java
+++ b/src/main/java/com/yingying/tourist/web/QuestionController.java
@@ -3,10 +3,12 @@ package com.yingying.tourist.web;
 
				 import com.baomidou.mybatisplus.mapper.EntityWrapper;

			
 
				 import com.yingying.tourist.business.BusinessConstant;

			
 
				 import com.yingying.tourist.common.Util;

			
 
				+import com.yingying.tourist.domain.Config;

			
 
				 import com.yingying.tourist.domain.Question;

			
 
				 import com.yingying.tourist.domain.User;

			
 
				 import com.yingying.tourist.exception.ErrorCode;

			
 
				 import com.yingying.tourist.result.MessageResult;

			
 
				+import com.yingying.tourist.service.ConfigService;

			
 
				 import com.yingying.tourist.service.QuestionService;

			
 
				 import com.yingying.tourist.service.UserService;

			
 
				 import com.yingying.tourist.vo.QuestionVo;

			
@@ -15,9 +17,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 
				 import org.springframework.web.bind.annotation.GetMapping;

			
 
				 import org.springframework.web.bind.annotation.RestController;

			
 
				 

			
 
				-import java.util.Arrays;

			
 
				-import java.util.List;

			
 
				-

			
 
				 @RestController

			
 
				 public class QuestionController {

			
 
				 

			
@@ -27,6 +26,9 @@ public class QuestionController {
 
				     @Autowired

			
 
				     private UserService userService;

			
 
				 

			
 
				+    @Autowired

			
 
				+    private ConfigService configService;

			
 
				+

			
 
				     @GetMapping("question/pick")

			
 
				     public MessageResult<QuestionVo> question(String openid, String pick){

			
 
				         if (Util.isNull(pick)) {

			
@@ -43,6 +45,10 @@ public class QuestionController {
 
				         questionVo.setResultDestinationInfo(BusinessConstant.destinationMap.get(question.getResultOrder()));

			
 
				         questionVo.setResultDescribe(BusinessConstant.describeMap.get(Util.getRandomInt(1,16)));

			
 
				         questionVo.setResultIdentity(BusinessConstant.Identity.getValue(pickLast));

			
 
				+        EntityWrapper<Config> configWrapper = new EntityWrapper<>();

			
 
				+        configWrapper.eq("config_key", "h5_supernatant_show");

			
 
				+        Config config = configService.selectOne(configWrapper);

			
 
				+        questionVo.setShow("1".equals(config.getConfigValue()));

			
 
				         if (Util.isNotNull(openid)) {

			
 
				             EntityWrapper<User> userWrapper = new EntityWrapper<>();

			
 
				             userWrapper.eq("openid", openid);

			
--- a/src/main/resources/static/MP_verify_2KP7us2u8AdBTknC.txt
+++ b/src/main/resources/static/MP_verify_2KP7us2u8AdBTknC.txt
@@ -0,0 +1 @@
 
				+2KP7us2u8AdBTknC
			
--- a/src/main/resources/static/css/bske.css
+++ b/src/main/resources/static/css/bske.css
--- a/src/main/resources/static/img/1.png
+++ b/src/main/resources/static/img/1.png
--- a/src/main/resources/static/img/ban.png
+++ b/src/main/resources/static/img/ban.png
--- a/src/main/resources/static/img/e.png
+++ b/src/main/resources/static/img/e.png
--- a/src/main/resources/static/img/icon.jpg
+++ b/src/main/resources/static/img/icon.jpg
--- a/src/main/resources/static/img/subTitle.png
+++ b/src/main/resources/static/img/subTitle.png
--- a/src/main/resources/templates/index.html
+++ b/src/main/resources/templates/index.html
@@ -18,8 +18,7 @@
 
				 <script type="text/javascript" src='js/test.js'></script>

			
 
				 </head>

			
 
				 <body>

			
 
				-<div class="content">

			
 
				-	<div class="index">

			
 
				+<div class="con">

			
 
				 		<div class="centerWhite"></div>

			
 
				 		<div class="centerBg"></div>

			
 
				 		<div class="indecBottom"></div>

			
@@ -36,40 +35,11 @@
 
				 				<span class="btnBg"></span>

			
 
				 			</div>

			
 
				 		</div>

			
 
				-	</div>

			
 
				 </div>

			
 
				 <script type="text/javascript">

			
 
				-	// init.showIndicator();

			
 
				 	$(".testBtn").on("click",function(e){

			
 
				 		window.location.href='subject';

			
 
				 	});

			
 
				-

			
 
				-	// function getUrlParms(name){

			
 
				-	//    var reg = new RegExp("(^|&)"+ name +"=([^&]*)(&|$)");

			
 
				-	//    var r = window.location.search.substr(1).match(reg);

			
 
				-	//    if(r!=null) return unescape(r[2]); return null;

			
 
				-	// }

			
 
				-	// var code = getUrlParms("code");

			
 
				-	// var code = '011ByPSv02OZqj1eVBTv07X0Tv0ByPSj'

			
 
				-	// var openId = '';

			
 
				-	// $.ajax({  

			
 
				- //        type:'get',  

			
 
				- //        url : init.url+'code?code='+code,  

			
 
				- //        dataType:'JSON',

			
 
				- //        contentType:"application/json; charset=utf-8",

			
 
				- //        success:function(data) {  

			
 
				- //            console.log(data);  

			
 
				- //            openId = data.data

			
 
				- //            init.hideIndicator();

			
 
				- //        },  

			
 
				- //        error:function() {  

			
 
				- //            // alert('fail');  

			
 
				- //            init.hideIndicator();

			
 
				- //        }  

			
 
				- //    }); 

			
 
				-    // setTimeout(function(){

			
 
				-    // 	init.hideIndicator();

			
 
				-    // },2000)

			
 
				 </script>

			
 
				 </body>

			
 
				 

			
--- a/src/main/resources/templates/testShare.html
+++ b/src/main/resources/templates/testShare.html
--- a/src/main/resources/templates/textSubject.html
+++ b/src/main/resources/templates/textSubject.html
@@ -18,7 +18,7 @@
 
				 <script type="text/javascript" src='js/test.js'></script>

			
 
				 </head>

			
 
				 <body>

			
 
				-<div class="content">

			
 
				+<div class="con">

			
 
				 	<div class="subBg"></div>

			
 
				 	<div class="sub">

			
 
				 		<img class="subTitle" src="img/subTitle.png" />

			
@@ -64,6 +64,20 @@
 
				 </div>

			
 
				 <script type="text/javascript">

			
 
				 	$(function(){

			
 
				+		function onBridgeReady(){

			
 
				+		   WeixinJSBridge.call('hideToolbar');

			
 
				+		}

			
 
				+		if (typeof WeixinJSBridge == "undefined"){

			
 
				+		    if( document.addEventListener ){

			
 
				+		        document.addEventListener('WeixinJSBridgeReady', onBridgeReady, false);

			
 
				+		    }else if (document.attachEvent){

			
 
				+		        document.attachEvent('WeixinJSBridgeReady', onBridgeReady); 

			
 
				+		        document.attachEvent('onWeixinJSBridgeReady', onBridgeReady);

			
 
				+		    }

			
 
				+		}else{

			
 
				+		    onBridgeReady();

			
 
				+		}

			
 
				+

			
 
				 		var index = 0,pick = '',pickCol = '';

			
 
				 		$("#subBtn").on("click",function(e){

			
 
				 			if(pickCol != ''){

			
@@ -82,8 +96,9 @@
 
				 		});

			
 
				 		$("#submit").on("click",function(e){

			
 
				 			if(pickCol != ''){

			
 
				-				pick = pick +','+pickCol

			
 
				+				pick = pick +','+pickCol;

			
 
				 				window.location.href='shared?pick='+pick;

			
 
				+				index = 0,pick = '',pickCol = '';

			
 
				 			}

			
 
				 		});

			
 
				 		$(".choice").on("click",function(e){