Merge remote-tracking branch 'origin/master'

k94314517

2025-07-15 0f3f07d0e12025ea1a878059832ea951e373bbf9

Merge remote-tracking branch 'origin/master'

 admin/src/components/business/OperaIdentityDetailWindow.vue

@@ -11,8 +11,8 @@
      <div style="display: flex;background: #e4ecfe;padding: 20px">
        <div style="width: 60px;">
          <div class="home_title" v-if="info">
            <el-image v-if="info.imgurlFull" style="width: 50px; height: 50px;border-radius: 50%;margin-right: 10px" :src="info.imgurlFull"
                      :preview-src-list="[info.imgurlFull]">
            <el-image v-if="info.fullCoverImage" style="width: 50px; height: 50px;border-radius: 50%;margin-right: 10px" :src="info.fullCoverImage"
                      :preview-src-list="[info.fullCoverImage]">
            </el-image>
            <el-image v-else style="width: 50px; height: 50px;border-radius: 50%;margin-right: 10px" src="avatar/man.png" >
            </el-image>

 admin/src/components/business/OperaMemberDetailWindow.vue

@@ -11,8 +11,8 @@
      <div style="display: flex;background: #e4ecfe;padding: 20px">
        <div style="width: 60px;">
          <div class="home_title" v-if="info">
            <el-image v-if="info.imgurlFull" style="width: 50px; height: 50px;border-radius: 50%;margin-right: 10px" :src="info.imgurlFull"
                      :preview-src-list="[info.imgurlFull]">
            <el-image v-if="info.fullCoverImage" style="width: 50px; height: 50px;border-radius: 50%;margin-right: 10px" :src="info.fullCoverImage"
                      :preview-src-list="[info.fullCoverImage]">
            </el-image>
            <el-image v-else style="width: 50px; height: 50px;border-radius: 50%;margin-right: 10px" src="avatar/man.png" >
            </el-image>

 server/services/src/main/java/com/doumee/core/utils/huaweiOBS/ObsUtil.java

@@ -119,10 +119,10 @@

    public static void main(String[] args) {
        ObsUtil blobUtil = new ObsUtil("HPUAQVBRXX9A9TLZ3RTA","uHC2uoFh42Z2xgQmCBBtG8rNZ4Caf85qQ2DQqZZf","obs.cn-south-1.myhuaweicloud.com");
        blobUtil.uploadLocalFile(new File("D://static/1.png"),"jinkuai","identity/1.png");
        blobUtil.uploadLocalFile(new File("D://static/2.png"),"jinkuai","identity/2.png");
        blobUtil.uploadLocalFile(new File("D://static/3.png"),"jinkuai","identity/3.png");
        blobUtil.uploadLocalFile(new File("D://static/4.png"),"jinkuai","identity/4.png");
        blobUtil.uploadLocalFile(new File("D://static/1.png"),"jinkuai","member/1.png");
//        blobUtil.uploadLocalFile(new File("D://static/2.png"),"jinkuai","identity/2.png");
//        blobUtil.uploadLocalFile(new File("D://static/3.png"),"jinkuai","identity/3.png");
//        blobUtil.uploadLocalFile(new File("D://static/4.png"),"jinkuai","identity/4.png");
    }
    public static  Integer uploadNetFile(ObsClient obsClient,String bucketName,String url, String objectKey) throws IOException {
        InputStream is = new URL(url).openStream();