Merge remote-tracking branch 'origin/yanyuan' into yanyuan

cloudutil/src/main/java/com/ccsens/cloudutil/aspect/MustLoginAspect.java

@@ -106,6 +106,7 @@ public class MustLoginAspect {
         Long userId = json.getLong("id");
         String userName = json.getString("userName");
         String avatarUrl =  json.getString("avatarUrl");
+        String phone =  json.getString("phone");
         if (userId == null || userId == 0) {
             return JsonResponse.newInstance().ok(CodeEnum.NOT_LOGIN);
         }
@@ -114,6 +115,7 @@ public class MustLoginAspect {
             dto.setUserId(userId);
             dto.setUserName(userName);
             dto.setAvatarUrl(avatarUrl);
+            dto.setPhone(phone);
         }
 
         Object result = pjp.proceed();

cloudutil/src/main/java/com/ccsens/cloudutil/bean/tall/dto/ProjectDto.java

@@ -39,6 +39,8 @@ public class ProjectDto {
         private Long endTime;
         @ApiModelProperty("接口访问地址")
         private String url;
+        @ApiModelProperty("模板code")
+        private String code;
         @ApiModelProperty("用户列表")
         private Set<Long> userIdList;
     }

common/src/main/resources/mapper_dao/ProRoleDao.xml

@@ -152,6 +152,10 @@
         t_pro_role r
         LEFT JOIN t_label l on r.label_id = l.id
         LEFT JOIN t_pro_role_repulsion rr on r.id = rr.role_id and rr.rec_status = 0
+        and rr.repulsion_role_id in
+        <foreach collection="userRoleList" index="index" item="item" open="(" separator="," close=")">
+            #{item.id}
+        </foreach>
         WHERE
         r.project_id = #{projectId}
         and r.rec_status = 0

signin/src/main/resources/application.yml

@@ -1,5 +1,5 @@
 spring:
   profiles:
-    active: test
+    active: dev
-    include: util-test,common
+    include: util-dev,common
 

util/src/main/java/com/ccsens/util/wx/WxXcxUtil.java

@@ -135,7 +135,7 @@ public class WxXcxUtil {
         public String signType;
     }
 
-    //TODO
+
     private static final String URL_LOGIN
             = "https://api.weixin.qq.com/sns/jscode2session?appid=%1$s&secret=%2$s&js_code=%3$s&grant_type=%4$s";
     private static final String URL_GET_ACCESS_TOKEN
@@ -158,35 +158,38 @@ public class WxXcxUtil {
 //    private static final String appid = "wx7af1bf1e14facf82";
 //    private static final String secret = "a6613fae11b497639c0224b820aaf6d9";
 
-    //TODO
+
     private static final String appid = "wx356e01c7eb01d55d";
     private static final String secret = "353033db85d4b5a35f05d1c0176a0cc6";
-    //TODO
+
     private static final String appid_sq = "wx55fa235267ca11e6";
     private static final String secret_sq = "d75a5a7538ff9c72f781738850817081";
-    //TODO
+
     private static final String appid_sp = "wx2ebb5cf926fe1ddb";
     private static final String secret_sp = "38e4425b8e3647015b439c6d38172b49";
-    //TODO
+
     private static final String appid_bh = "wxd06d18fe7c75b498";
     private static final String secret_bh = "202ad7f3d95b0532948c667c468c9a56";
-    //TODO
+
     private static final String appid_health = "wx2f9ef33e08053bbf";
     private static final String secret_health = "af90801c26bc177681b2c39a603605b9";
-    //TODO
+
     private static final String appid_enterprise = "wx808fa75921bd8f22";
     private static final String secret_enterprise = "8d2e95462bfeab363ee84776bc807859";
-    //TODO
+
     private static final String appid_tall = "wxf72a76c2ea24a472";
     private static final String secret_tall = "5aa3fc421a149ec1e59a4a4f472e1223";
     // 暴风眼
     private static final String appid_basic_car = "wx3190e3f68dd4d068";
     private static final String secret_basic_car = "71d797c1f81f9f0caadab3289ee7367c";
+    // 燕园小程序
+    private static final String APPID_YANYUAN = "wx733e229f00dc5c6f";
+    private static final String SECRET_YANYUAN = "9aa0a81973cc5f13c02548b5244accc2";
 
     private static final String mchid = "";
     private static final String key = "";
 
-    //TODO
+
     private static String appId(String gameType){
         switch (gameType){
             case "SP":
@@ -203,12 +206,13 @@ public class WxXcxUtil {
                 return appid_tall;
             case "basicCar":
                 return appid_basic_car;
+            case "yanyuan":
+                return APPID_YANYUAN;
             default:
                 return appid;
         }
     }
 
-    //TODO
     private static String secret(String gameType){
         switch (gameType){
             case "SP":
@@ -225,12 +229,13 @@ public class WxXcxUtil {
                 return secret_tall;
             case "basicCar":
                 return secret_basic_car;
+            case "yanyuan":
+                return SECRET_YANYUAN;
             default:
                 return secret;
         }
     }
 
-    //TODO
     /**
      * 小程序登陆，根据code获取用户信息(openid,sessionKey,)
      * @param code