Quellcode durchsuchen

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

lidongze vor 3 Jahren
Ursprung
Commit
6006b2e2f6

+ 1 - 0
src/main/java/com/izouma/nineth/config/WebMvcConfig.java

@@ -41,6 +41,7 @@ public class WebMvcConfig implements WebMvcConfigurer {
         registry.addResourceHandler("/admin/**").addResourceLocations("classpath:/static/admin/");
         registry.addResourceHandler("/files/**").addResourceLocations("file:" + localPath);
         registry.addResourceHandler("/MP_verify*").addResourceLocations("classpath:/");
+        registry.addResourceHandler("/u951658VPf.txt").addResourceLocations("classpath:/static/");
     }
 
     @Bean

+ 3 - 0
src/main/java/com/izouma/nineth/domain/Coupon.java

@@ -44,4 +44,7 @@ public class Coupon extends BaseEntity {
 
     @Transient
     private List<GeneralDTO> collections;
+
+    @Column(columnDefinition = "bigint default 1 not null")
+    private Long companyId = 1L;
 }

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

@@ -165,6 +165,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
                 .antMatchers("/asset/topTen").permitAll()
                 .antMatchers("/metaUser/internalTest").permitAll()
                 .antMatchers("/metaShowRoomAsset/**").permitAll()
+                .antMatchers("/u951658VPf.txt").permitAll()
 
                 // all other requests need to be authenticated
                 .anyRequest().authenticated().and()

+ 1 - 1
src/main/java/com/izouma/nineth/web/AirDropController.java

@@ -23,7 +23,7 @@ public class AirDropController extends BaseController {
     private AirDropService airDropService;
     private AirDropRepo    airDropRepo;
 
-    @PreAuthorize("hasRole('ADMIN')")
+    @PreAuthorize("hasAnyRole('ADMIN', 'SAAS')")
     @PostMapping("/save")
     public AirDrop save(@RequestBody AirDrop record) {
         return airDropService.create(record);

+ 1 - 1
src/main/java/com/izouma/nineth/web/CouponController.java

@@ -28,7 +28,7 @@ public class CouponController extends BaseController {
     private CouponRepo     couponRepo;
     private CollectionRepo collectionRepo;
 
-    @PreAuthorize("hasRole('ADMIN')")
+    @PreAuthorize("hasAnyRole('ADMIN','SAAS')")
     @PostMapping("/save")
     public Coupon save(@RequestBody Coupon record) {
         if (record.getId() != null) {

+ 1 - 1
src/main/java/com/izouma/nineth/web/UserController.java

@@ -242,7 +242,7 @@ public class UserController extends BaseController {
         return userService.searchByPhone(phone);
     }
 
-    @PreAuthorize("hasAnyRole('ADMIN', 'OPERATOR')")
+    @PreAuthorize("hasAnyRole('ADMIN', 'OPERATOR', 'SAAS')")
     @PostMapping("/searchByPhoneAdmin")
     public Map<String, Object> searchByPhoneAdmin(@RequestParam String phone) {
         return userService.searchByPhoneAdmin(phone);

+ 50 - 0
src/main/resources/static/pc.html

@@ -0,0 +1,50 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>RAEX绿洲</title>
+    <script src="/static/js/jquery.min.js"></script>
+    <link href="/static/css/devices.min.css" rel="stylesheet" />
+    <style>
+      body,
+      html {
+        margin: 0;
+        padding: 0;
+        background-color: #f8f9f9;
+        height: 100%;
+        width: 100%;
+        font-family: -apple-system, SF UI Text, Arial, PingFang SC,
+          Hiragino Sans GB, Microsoft YaHei, WenQuanYi Micro Hei, sans-serif;
+      }
+
+      body {
+        display: flex;
+        align-items: center;
+        justify-content: center;
+      }
+
+      .phone {
+        width: 500px;
+        height: calc(100% - 1px);
+        margin: 0;
+        padding: 0;
+      }
+
+      .phone iframe {
+        width: 100%;
+        height: 100%;
+        border: none;
+        outline: none;
+        display: block;
+      }
+    </style>
+  </head>
+
+  <body>
+    <div class="phone">
+      <iframe src="https://www.raex.vip/9th/home" frameborder="0"></iframe>
+    </div>
+  </body>
+</html>

+ 1 - 0
src/main/resources/static/u951658VPf.txt

@@ -0,0 +1 @@
+c093b42ff5429c47b4203f2736ba05c4

+ 1 - 1
src/main/vue/src/views/BlindBoxEdit.vue

@@ -220,7 +220,7 @@
                         <el-radio v-model="formData.noSoldOut" :label="false">是</el-radio>
                         <el-radio v-model="formData.noSoldOut" :label="true">否</el-radio>
                     </el-form-item>
-                    <el-form-item prop="couponPayment" label="支付方式" v-if="!isCompany">
+                    <el-form-item prop="couponPayment" label="支付方式">
                         <el-radio-group v-model="formData.couponPayment">
                             <el-radio :label="true">兑换券</el-radio>
                             <el-radio :label="false">支付宝/微信</el-radio>

+ 4 - 3
src/main/vue/src/views/CollectionEdit.vue

@@ -166,7 +166,7 @@
                             </el-input-number>
                         </el-form-item>
                         <el-form-item prop="serviceCharge" label="手续费(%)">
-                            <el-input-number v-model="formData.serviceCharge" :min="0" :max="99" :disabled="!canEdit">
+                            <el-input-number v-model="formData.serviceCharge" :min="0" :max="99" :disabled="!canEdit || isCompany">
                             </el-input-number>
                         </el-form-item>
                     </div>
@@ -266,7 +266,7 @@
                         <el-radio v-model="formData.noSoldOut" :label="false">是</el-radio>
                         <el-radio v-model="formData.noSoldOut" :label="true">否</el-radio>
                     </el-form-item>
-                    <el-form-item prop="couponPayment" label="支付方式" v-if="!isCompany">
+                    <el-form-item prop="couponPayment" label="支付方式">
                         <el-radio-group v-model="formData.couponPayment">
                             <el-radio :label="true">兑换券</el-radio>
                             <el-radio :label="false">支付宝/微信</el-radio>
@@ -480,7 +480,8 @@ export default {
                 couponPayment: false,
                 chainFlag: 3,
                 vip: false,
-                messNumber: false
+                messNumber: false,
+                serviceCharge: 5
             },
             rules: {
                 name: [