springcloud_k8s_panzhihuazhihuishequ/.idea/workspace.xml
@@ -24,7 +24,7 @@ <component name="ChangeListManager"> <list default="true" id="8ba27629-3e5d-4f42-993e-d0c055bc9371" name="Default Changelist" comment=""> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngVolunteerMngDAO.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngVolunteerMngDAO.java" afterDir="false" /> </list> <option name="SHOW_DIALOG" value="false" /> <option name="HIGHLIGHT_CONFLICTS" value="true" /> @@ -404,7 +404,7 @@ <workItem from="1610934956567" duration="1325000" /> <workItem from="1610939265133" duration="8588000" /> <workItem from="1610956684718" duration="7037000" /> <workItem from="1611019208339" duration="14141000" /> <workItem from="1611019208339" duration="15275000" /> </task> <servers /> </component> @@ -524,10 +524,10 @@ <screen x="0" y="0" width="1536" height="824" /> </state> <state x="93" y="93" width="1350" height="639" key="com.intellij.history.integration.ui.views.FileHistoryDialog/0.0.1536.824@0.0.1536.824" timestamp="1611023689827" /> <state x="468" y="42" width="766" height="782" key="find.popup" timestamp="1611032355772"> <state x="468" y="42" width="766" height="782" key="find.popup" timestamp="1611040842504"> <screen x="0" y="0" width="1536" height="824" /> </state> <state x="468" y="42" width="766" height="782" key="find.popup/0.0.1536.824@0.0.1536.824" timestamp="1611032355772" /> <state x="468" y="42" width="766" height="782" key="find.popup/0.0.1536.824@0.0.1536.824" timestamp="1611040842504" /> <state width="600" height="428" key="javadoc.popup" timestamp="1610005781618"> <screen x="0" y="0" width="1536" height="824" /> </state> springcloud_k8s_panzhihuazhihuishequ/applets/src/main/resources/bootstrap.yml
@@ -6,9 +6,9 @@ discovery: enabled: true service-id: config # 注册中心的服务名 profile: dev # 指定配置文件的环境 profile: test # 指定配置文件的环境 profiles: active: dev active: test eureka: client: springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/resources/bootstrap.yml
@@ -6,9 +6,9 @@ discovery: enabled: true service-id: config # 注册中心的服务名 profile: dev # 指定配置文件的环境 profile: test # 指定配置文件的环境 profiles: active: dev active: test eureka: client: springcloud_k8s_panzhihuazhihuishequ/auth/src/main/resources/bootstrap.yml
@@ -6,9 +6,9 @@ discovery: enabled: true service-id: config # 注册中心的服务名 profile: dev # 指定配置文件的环境 profile: test # 指定配置文件的环境 profiles: active: dev active: test eureka: client: springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/resources/bootstrap.yml
@@ -6,9 +6,9 @@ discovery: enabled: true service-id: config # 注册中心的服务名 profile: dev # 指定配置文件的环境 profile: test # 指定配置文件的环境 profiles: active: dev active: test eureka: client: springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngVolunteerMngDAO.java
@@ -45,7 +45,7 @@ " and name = #{comMngVolunteerMngVO.name} \n" + " </if> " + "<if test='comMngVolunteerMngVO.phone != null and comMngVolunteerMngVO.phone.trim() != ""'>" + "AND phone = #{comMngVolunteerMngVO.phone}" + "AND phone like concat(#{comMngVolunteerMngVO.phone},'%') " + " </if> " + " order by integral desc,create_at desc"+ "</script>") @@ -63,10 +63,10 @@ "WHERE\n" + "state in (1,3)\n" + "<if test='comMngVolunteerMngVO.name != null and comMngVolunteerMngVO.name.trim() != ""'>" + "and name = #{comMngVolunteerMngVO.name} \n" + "and name like concat(#{comMngVolunteerMngVO.name},'%') \n" + " </if> " + "<if test='comMngVolunteerMngVO.phone != null and comMngVolunteerMngVO.phone.trim() != ""'>" + "AND phone = #{comMngVolunteerMngVO.phone}\n" + "AND phone like concat(#{comMngVolunteerMngVO.phone},'%')\n" + " </if> " + "<if test='comMngVolunteerMngVO.state != null and comMngVolunteerMngVO.state != 0'>" + "and state=#{comMngVolunteerMngVO.state}\n" + springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/bootstrap.yml
@@ -6,9 +6,9 @@ discovery: enabled: true service-id: config # 注册中心的服务名 profile: dev # 指定配置文件的环境 profile: test # 指定配置文件的环境 profiles: active: dev active: test eureka: client: springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/bootstrap.yml
@@ -6,9 +6,9 @@ discovery: enabled: true service-id: config # 注册中心的服务名 profile: dev # 指定配置文件的环境 profile: test # 指定配置文件的环境 profiles: active: dev active: test eureka: client: springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/resources/bootstrap.yml
@@ -6,9 +6,9 @@ discovery: enabled: true service-id: config # 注册中心的服务名 profile: dev # 指定配置文件的环境 profile: test # 指定配置文件的环境 profiles: active: dev active: test eureka: client: springcloud_k8s_panzhihuazhihuishequ/timejob/src/main/resources/bootstrap.yml
@@ -6,9 +6,9 @@ discovery: enabled: true service-id: config # 注册中心的服务名 profile: dev # 指定配置文件的环境 profile: test # 指定配置文件的环境 profiles: active: dev active: test eureka: client: springcloud_k8s_panzhihuazhihuishequ/zuul/src/main/resources/bootstrap.yml
@@ -6,9 +6,9 @@ discovery: enabled: true service-id: config # 注册中心的服务名 profile: dev # 指定配置文件的环境 profile: test # 指定配置文件的环境 profiles: active: dev active: test eureka:
