浏览代码

admin 2月15号

guojing 5 年之前
父节点
当前提交
7b3f195db0

+ 2 - 2
whepi-ui/templates/home/htlpXq.ftl

@@ -68,7 +68,7 @@
 <script>
     var task = ${taskJson};
     var userId = ${userId};
-    var YeuserId = ${YeuserId};//业委会id
+    <#--var YeuserId = ${YeuserId};//业委会id-->
     (function ($) {
 
         if (task.taskStatus == 2 || task.taskStatus == 3) {
@@ -113,7 +113,7 @@
             url: '/yeweihui/qiuzhu/reply/add.json',
             type: 'post',
             data: {
-                userId: YeuserId,
+                userId: userId,
                 taskId: task.taskId,
                 replyContent: qzcontent,
                 userCreate: userId,

+ 3 - 3
whepi-web/src/main/java/com/bofeng/wx/controller/HomeController.java

@@ -97,12 +97,12 @@ public class HomeController {
   public ModelAndView quxiao(@Pd(name = "taskId") Long taskId, @Pd(name = "userId") Long userId, ModelMap model) throws JsonProcessingException {
     QzTask task = qzTaskService.queryByTaskId(taskId);
 
-    //回复人的id
+  /*  //回复人的id
     QzTaskReply qzTaskReply = qzTaskReplyService.selectId(taskId);
     Long userId1 = null;
     if (qzTaskReply != null) {
       userId1 = qzTaskReply.getUserId();
-    }
+    }*/
 
 
 //        A业委会,B居委会,C物业,D志愿者
@@ -134,7 +134,7 @@ public class HomeController {
     model.put("taskJson", new JsonWapper(task));
     model.put("task", task);
     model.put("userId", "\"" + userId + "\"");
-    model.put("YeuserId", "\"" + userId1 + "\"");
+    //model.put("YeuserId", "\"" + userId1 + "\"");
     return new ModelAndView("/home/htlpXq.ftl", model);
   }
 

+ 2 - 2
whepi-web/src/main/resources/application-guojing.yml

@@ -65,8 +65,8 @@ spring:
     #driverClassName: com.mysql.jdbc.Driver
     #url: jdbc:mysql://localhost:3306/bofeng_test?autoReconnect=true&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false
     driverClassName: net.sf.log4jdbc.DriverSpy
-    url: jdbc:log4jdbc:mysql://localhost:3306/whepi_test?autoReconnect=true&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false
-    username: root
+    url: jdbc:log4jdbc:mysql://39.99.148.1:3306/whepi_test?autoReconnect=true&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false
+    username: whepi_test
     password: 123456
 
   redis:

+ 1 - 1
whepi-web/src/main/resources/application.yml

@@ -43,7 +43,7 @@ endpoints:
 #  whitelabel.enabled: false
 
 spring:
-  profiles.active: lll
+  profiles.active: guojing
 
   application:
     name: bofeng-web