service_userpom修改

huanghongfa

2020-12-21 8c6119a8677cf853469b14da2f8fde990a2f5a3d

service_userpom修改

 springcloud_k8s_panzhihuazhihuishequ/.idea/workspace.xml

@@ -24,8 +24,8 @@
  <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$/eureka_server/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/eureka_server/pom.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/eureka_server/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/eureka_server/src/main/resources/application.yml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/applets/src/main/java/com/panzhihua/applets/api/LoginApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/applets/src/main/java/com/panzhihua/applets/api/LoginApi.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/community_backstage/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/community_backstage/src/main/resources/bootstrap.yml" afterDir="false" />
    </list>
    <option name="SHOW_DIALOG" value="false" />
    <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -374,7 +374,7 @@
      <workItem from="1608371107059" duration="646000" />
      <workItem from="1608371917868" duration="79000" />
      <workItem from="1608379508016" duration="46000" />
      <workItem from="1608531425658" duration="3708000" />
      <workItem from="1608531425658" duration="6082000" />
    </task>
    <servers />
  </component>
@@ -414,10 +414,10 @@
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state x="499" y="159" key="#com.intellij.refactoring.safeDelete.UnsafeUsagesDialog/0.0.1536.824@0.0.1536.824" timestamp="1608103012443" />
    <state width="561" height="466" key="DebuggerActiveHint" timestamp="1607675048319">
    <state width="561" height="466" key="DebuggerActiveHint" timestamp="1608537541370">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="561" height="466" key="DebuggerActiveHint/0.0.1536.824@0.0.1536.824" timestamp="1607675048319" />
    <state width="561" height="466" key="DebuggerActiveHint/0.0.1536.824@0.0.1536.824" timestamp="1608537541370" />
    <state x="93" y="93" width="1350" height="638" key="DiffContextDialog" timestamp="1608535183408">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
@@ -426,54 +426,54 @@
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state x="549" y="167" key="FileChooserDialogImpl/0.0.1536.824@0.0.1536.824" timestamp="1606197830966" />
    <state width="1031" height="374" key="GridCell.Tab.0.bottom" timestamp="1608535846435">
    <state width="1031" height="238" key="GridCell.Tab.0.bottom" timestamp="1608537971388">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="374" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1608535846435" />
    <state width="1031" height="374" key="GridCell.Tab.0.center" timestamp="1608535846435">
    <state width="1031" height="238" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1608537971388" />
    <state width="1031" height="238" key="GridCell.Tab.0.center" timestamp="1608537971387">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="374" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1608535846435" />
    <state width="1031" height="374" key="GridCell.Tab.0.left" timestamp="1608535846435">
    <state width="1031" height="238" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1608537971387" />
    <state width="1031" height="238" key="GridCell.Tab.0.left" timestamp="1608537971387">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="374" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1608535846435" />
    <state width="1031" height="374" key="GridCell.Tab.0.right" timestamp="1608535846435">
    <state width="1031" height="238" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1608537971387" />
    <state width="1031" height="238" key="GridCell.Tab.0.right" timestamp="1608537971388">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="374" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1608535846435" />
    <state width="1031" height="374" key="GridCell.Tab.1.bottom" timestamp="1608535846436">
    <state width="1031" height="238" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1608537971388" />
    <state width="1031" height="238" key="GridCell.Tab.1.bottom" timestamp="1608537971388">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="374" key="GridCell.Tab.1.bottom/0.0.1536.824@0.0.1536.824" timestamp="1608535846436" />
    <state width="1031" height="374" key="GridCell.Tab.1.center" timestamp="1608535846435">
    <state width="1031" height="238" key="GridCell.Tab.1.bottom/0.0.1536.824@0.0.1536.824" timestamp="1608537971388" />
    <state width="1031" height="238" key="GridCell.Tab.1.center" timestamp="1608537971388">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="374" key="GridCell.Tab.1.center/0.0.1536.824@0.0.1536.824" timestamp="1608535846435" />
    <state width="1031" height="374" key="GridCell.Tab.1.left" timestamp="1608535846435">
    <state width="1031" height="238" key="GridCell.Tab.1.center/0.0.1536.824@0.0.1536.824" timestamp="1608537971388" />
    <state width="1031" height="238" key="GridCell.Tab.1.left" timestamp="1608537971388">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="374" key="GridCell.Tab.1.left/0.0.1536.824@0.0.1536.824" timestamp="1608535846435" />
    <state width="1031" height="374" key="GridCell.Tab.1.right" timestamp="1608535846435">
    <state width="1031" height="238" key="GridCell.Tab.1.left/0.0.1536.824@0.0.1536.824" timestamp="1608537971388" />
    <state width="1031" height="238" key="GridCell.Tab.1.right" timestamp="1608537971388">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="374" key="GridCell.Tab.1.right/0.0.1536.824@0.0.1536.824" timestamp="1608535846435" />
    <state width="1031" height="374" key="GridCell.Tab.2.bottom" timestamp="1608535846436">
    <state width="1031" height="238" key="GridCell.Tab.1.right/0.0.1536.824@0.0.1536.824" timestamp="1608537971388" />
    <state width="1031" height="238" key="GridCell.Tab.2.bottom" timestamp="1608537971388">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="374" key="GridCell.Tab.2.bottom/0.0.1536.824@0.0.1536.824" timestamp="1608535846436" />
    <state width="1031" height="374" key="GridCell.Tab.2.center" timestamp="1608535846436">
    <state width="1031" height="238" key="GridCell.Tab.2.bottom/0.0.1536.824@0.0.1536.824" timestamp="1608537971388" />
    <state width="1031" height="238" key="GridCell.Tab.2.center" timestamp="1608537971388">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="374" key="GridCell.Tab.2.center/0.0.1536.824@0.0.1536.824" timestamp="1608535846436" />
    <state width="1031" height="374" key="GridCell.Tab.2.left" timestamp="1608535846436">
    <state width="1031" height="238" key="GridCell.Tab.2.center/0.0.1536.824@0.0.1536.824" timestamp="1608537971388" />
    <state width="1031" height="238" key="GridCell.Tab.2.left" timestamp="1608537971388">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="374" key="GridCell.Tab.2.left/0.0.1536.824@0.0.1536.824" timestamp="1608535846436" />
    <state width="1031" height="374" key="GridCell.Tab.2.right" timestamp="1608535846436">
    <state width="1031" height="238" key="GridCell.Tab.2.left/0.0.1536.824@0.0.1536.824" timestamp="1608537971388" />
    <state width="1031" height="238" key="GridCell.Tab.2.right" timestamp="1608537971388">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="374" key="GridCell.Tab.2.right/0.0.1536.824@0.0.1536.824" timestamp="1608535846436" />
    <state width="1031" height="238" key="GridCell.Tab.2.right/0.0.1536.824@0.0.1536.824" timestamp="1608537971388" />
    <state x="299" y="67" key="Maven.ArtifactSearchDialog" timestamp="1606714311663">
      <screen x="0" y="0" width="1536" height="824" />
    </state>

 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/LoginApi.java

@@ -4,6 +4,7 @@
import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult;
import cn.binarywang.wx.miniapp.bean.WxMaPhoneNumberInfo;
import cn.binarywang.wx.miniapp.bean.WxMaUserInfo;
import com.alibaba.fastjson.JSONObject;
import com.panzhihua.applets.config.WxMaConfiguration;
import com.panzhihua.applets.model.vos.LoginRequest;
import com.panzhihua.common.model.vos.LoginReturnVO;
@@ -58,11 +59,14 @@
            sessionInfo=new WxMaJscode2SessionResult();
            sessionInfo.setOpenid("88888888");
            sessionInfo.setSessionKey("9999999");
            sessionInfo.setUnionid("44444444");
        }
        log.info("微信登录成功【{}】", JSONObject.toJSONString(sessionInfo));
        String openid = sessionInfo.getOpenid();
        String sessionKey = sessionInfo.getSessionKey();
        String unionid = sessionInfo.getUnionid();
        if (ObjectUtils.isEmpty(unionid)) {
            unionid="无";
        }
        userService.addOrUpdate(openid,sessionKey,unionid);
        return tokenService.loginApplets(openid);
    }

 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/resources/bootstrap.yml

@@ -6,7 +6,7 @@
      discovery:
        enabled: true
        service-id: config  # 注册中心的服务名
      profile: dev  # 指定配置文件的环境
      profile: test  # 指定配置文件的环境

eureka:
  client:

 springcloud_k8s_panzhihuazhihuishequ/pom.xml

@@ -204,6 +204,7 @@
        <module>applets</module>
        <module>community_backstage</module>
        <module>service_community</module>
        <module>service_user</module>
    </modules>
    <packaging>pom</packaging>