licailing 5 лет назад
Родитель
Сommit
20ee5f71f6

+ 0 - 1
src/main/java/com/izouma/wenlvju/repo/UserRepo.java

@@ -9,7 +9,6 @@ import org.springframework.data.jpa.repository.Query;
 
 import javax.transaction.Transactional;
 import java.util.List;
-import java.util.Set;
 
 public interface UserRepo extends JpaRepository<User, Long>, JpaSpecificationExecutor<User> {
     @Transactional

+ 1 - 0
src/main/java/com/izouma/wenlvju/security/WebSecurityConfig.java

@@ -66,6 +66,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
                 .antMatchers("/gradingOrganization/all").permitAll()
                 .antMatchers("/district").permitAll()
                 .antMatchers("/rate/export/**").permitAll()
+                .antMatchers("/pdf/web/**").permitAll()
                 .antMatchers("/rate/test").permitAll()
                 .antMatchers("/district/NJ").permitAll()
                 .antMatchers("/setting/byFlag").permitAll()

+ 3 - 3
src/main/resources/application.yaml

@@ -78,14 +78,14 @@ aliyun:
     access-key-id: PXzJyah5rZfWHIIH
     access-key-secret: e1MS6j0wypXJrw8CM0hObZu8qKbfah
     oss-end-point: oss-cn-hangzhou.aliyuncs.com
-    oss-bucket-name: exam
-    oss-domain: https://exam.oss-cn-hangzhou.aliyuncs.com
+    oss-bucket-name: wenlvju
+    oss-domain: https://wenlvju.oss-cn-hangzhou.aliyuncs.com
 njwl:
     app_id: 189610
     app_key: 3e8d47d8-e6de-4b75-aa07-02b0d6c83678
     url:  http://sms.njlyw.cn/ApiSmsSer/NjuSms/SubmitMultipleMessage
 general:
-    host: http://exam.izouma.com
+    host: http://wlj.izouma.com
 ---
 
 spring:

+ 28 - 28
src/test/java/com/izouma/wenlvju/repo/RepoTest.java

@@ -26,35 +26,35 @@ public class RepoTest extends ApplicationTests {
     @Test
     public void test() {
 
-//        List<Collaborate> users = collaborateRepo.findAll();
-//        users.forEach(user -> {
-//            List<String> strs = new ArrayList<>();
-//            user.getConsent().forEach(con -> {
-//                String path = con.substring(con.lastIndexOf("/", con.lastIndexOf("/") - 1) + 1);
-//                String url = storageService.uploadFromUrl(con, path);
-//                strs.add(url);
-//            });
-//            user.setConsent(strs);
-//            collaborateRepo.save(user);
-//        });
-
-//        List<Organization> users = organizationRepo.findAll();
-//        users.forEach(user -> {
-//            String con = user.getBusinessLicense();
-//            if (StrUtil.isNotBlank(con)) {
-//
-//
-//                String path = con.substring(con.lastIndexOf("/", con.lastIndexOf("/") - 1) + 1);
-//                String url = storageService.uploadFromUrl(con, path);
-//
-//                user.setBusinessLicense(url);
-//                organizationRepo.save(user);
-//            }
-//        });
-
-
-        List<Rate> users = rateRepo.findAll();
+        List<Collaborate> users = collaborateRepo.findAll();
         users.forEach(user -> {
+            List<String> strs = new ArrayList<>();
+            user.getConsent().forEach(con -> {
+                String path = con.substring(con.lastIndexOf("/", con.lastIndexOf("/") - 1) + 1);
+                String url = storageService.uploadFromUrl(con, path);
+                strs.add(url);
+            });
+            user.setConsent(strs);
+            collaborateRepo.save(user);
+        });
+
+        List<Organization> users1 = organizationRepo.findAll();
+        users1.forEach(user -> {
+            String con = user.getBusinessLicense();
+            if (StrUtil.isNotBlank(con)) {
+
+
+                String path = con.substring(con.lastIndexOf("/", con.lastIndexOf("/") - 1) + 1);
+                String url = storageService.uploadFromUrl(con, path);
+
+                user.setBusinessLicense(url);
+                organizationRepo.save(user);
+            }
+        });
+
+
+        List<Rate> users2 = rateRepo.findAll();
+        users2.forEach(user -> {
             List<String> strs = new ArrayList<>();
             List<String> strs1 = new ArrayList<>();
             List<String> strs2 = new ArrayList<>();

+ 2 - 1
src/test/java/com/izouma/wenlvju/repo/UserRepoTest.java

@@ -74,7 +74,8 @@ public class UserRepoTest {
 
     @Test
     public void test3() {
-        System.out.println(jwtTokenUtil.generateToken(JwtUserFactory.create(userRepo.findById(59L)
+        System.out.println(jwtTokenUtil.generateToken(JwtUserFactory.create(userRepo.findById(3L)
                 .orElseThrow(new BusinessException("用户不存在")))));
     }
+
 }